From 41bd92c0db38d34a3c000ff9dea97efe5eea11e9 Mon Sep 17 00:00:00 2001
From: cryx <cryx@h3q.com>
Date: Fri, 15 Jan 2010 15:06:24 +0000
Subject: Wrong order.
---
ezjail-admin | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'ezjail-admin')
diff --git a/ezjail-admin b/ezjail-admin
index 3ca6fe8..3719a7f 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1169,10 +1169,10 @@ restore)
# Now all parameters are here, invoke ezjail-admin create
[ "${ezjail_rootdir}" -a "${ezjail_ips}" -a "${ezjail_hostname}" ] || exerr "Error: Archive does not contain a valid ezjail properties file.\n Some jails properties are missing."
- # Setup the ezjail_imagedata. Only use the imagesize if we really have one, ZFS imagejails don't necessarily have a size.
- [ "${ezjail_imagetype}" -a ${ezjail_nameprop_imgagesize} ] && ezjail_imagedata="-c ${ezjail_imagetype} -C '${ezjail_attachparams}' -s ${ezjail_nameprop_imgagesize}"
+ # Setup the ezjail_imagedata.
[ "${ezjail_imagetype}" ] && ezjail_imagedata="-c ${ezjail_imagetype} -C '${ezjail_attachparams}'"
-
+ # Only use the imagesize if we really have one, ZFS imagejails don't necessarily have a size.
+ [ "${ezjail_imagetype}" -a ${ezjail_nameprop_imgagesize} ] && ezjail_imagedata="-c ${ezjail_imagetype} -C '${ezjail_attachparams}' -s ${ezjail_nameprop_imgagesize}"
$0 create -a "${ezjail_fromarchive}" -A "${ezjail_config}" ${ezjail_imagedata} -r "${ezjail_rootdir}" "${ezjail_hostname}" "${ezjail_ips}" || exerr "Error: Create failed."
rm -f "${ezjail_config}"
--
cgit v1.2.3