summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcryx <cryx@h3q.com>2010-01-15 15:06:24 +0000
committercryx <cryx@h3q.com>2010-01-15 15:06:24 +0000
commit41bd92c0db38d34a3c000ff9dea97efe5eea11e9 (patch)
tree3e7d3173bf28f68dd06ec5f0640ae38487745d58
parent9b555d6e41a68fea9210f6466a154413694c60f9 (diff)
Wrong order.
-rwxr-xr-xezjail-admin6
1 files changed, 3 insertions, 3 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 3ca6fe8..3719a7f 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1169,10 +1169,10 @@ restore)
1169 1169
1170 # Now all parameters are here, invoke ezjail-admin create 1170 # Now all parameters are here, invoke ezjail-admin create
1171 [ "${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." 1171 [ "${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."
1172 # Setup the ezjail_imagedata. Only use the imagesize if we really have one, ZFS imagejails don't necessarily have a size. 1172 # Setup the ezjail_imagedata.
1173 [ "${ezjail_imagetype}" -a ${ezjail_nameprop_imgagesize} ] && ezjail_imagedata="-c ${ezjail_imagetype} -C '${ezjail_attachparams}' -s ${ezjail_nameprop_imgagesize}"
1174 [ "${ezjail_imagetype}" ] && ezjail_imagedata="-c ${ezjail_imagetype} -C '${ezjail_attachparams}'" 1173 [ "${ezjail_imagetype}" ] && ezjail_imagedata="-c ${ezjail_imagetype} -C '${ezjail_attachparams}'"
1175 1174 # Only use the imagesize if we really have one, ZFS imagejails don't necessarily have a size.
1175 [ "${ezjail_imagetype}" -a ${ezjail_nameprop_imgagesize} ] && ezjail_imagedata="-c ${ezjail_imagetype} -C '${ezjail_attachparams}' -s ${ezjail_nameprop_imgagesize}"
1176 $0 create -a "${ezjail_fromarchive}" -A "${ezjail_config}" ${ezjail_imagedata} -r "${ezjail_rootdir}" "${ezjail_hostname}" "${ezjail_ips}" || exerr "Error: Create failed." 1176 $0 create -a "${ezjail_fromarchive}" -A "${ezjail_config}" ${ezjail_imagedata} -r "${ezjail_rootdir}" "${ezjail_hostname}" "${ezjail_ips}" || exerr "Error: Create failed."
1177 rm -f "${ezjail_config}" 1177 rm -f "${ezjail_config}"
1178 1178