summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2008-05-19 09:33:38 +0000
committererdgeist <erdgeist@erdgeist.org>2008-05-19 09:33:38 +0000
commit6c44af6f908390fda803364b1d4155b949fe0242 (patch)
tree522008243eb47288215ee0ff95069fb144fb9fd2
parent265e1dc36d0f4246b267967dbdc023575f1dc943 (diff)
Fix quoting errors.
-rwxr-xr-xezjail-admin13
1 files changed, 2 insertions, 11 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 26a626b..da65082 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -948,17 +948,8 @@ restore)
948 948
949 # Catch all errors that will likely create a broken backup 949 # Catch all errors that will likely create a broken backup
950 [ "${ezjail_safename}" -a "${ezjail_safename}" != "${ezjail_nameprop_safename}" ] && exerr "Error: Archive name ${ezjail_fromarchive} does not match archived jail ${ezjail_nameprop_safename}." 950 [ "${ezjail_safename}" -a "${ezjail_safename}" != "${ezjail_nameprop_safename}" ] && exerr "Error: Archive name ${ezjail_fromarchive} does not match archived jail ${ezjail_nameprop_safename}."
951 [ "${ezjail_hsname}" != "${ezjail_nameprop_hsname}" ] && exerr "Error: Can only use restore on the same machine. Consider using \"ezjail-admin create -a\" when migrating ezjails." 951 [ "${ezjail_hsname}" != "${ezjail_nameprop_hsname}" ] && exerr "Error: Archive was created on host named ${ezjail_hsname}. Can only use restore on the same machine. Consider using \"ezjail-admin create -a\" when migrating ezjails."
952 [ "${ezjail_hscpu} != "${ezjail_nameprop_hscpu}" ] && exerr Error: Archive was created on a different cpu Can not restore. Consider using \"ezjail-admin create -a\" when migrating ezjails." 952 [ "${ezjail_hscpu}" != "${ezjail_nameprop_hscpu}" ] && exerr "Error: Archive was created on a different CPU. Can not restore. Consider using \"ezjail-admin create -a\" when migrating ezjails."
953
954 # BIG security hole here. Must trust content of archive
955# pax -wzXt -x ustar ${ezjail_fromarchive} \
956# -s:prop.ezjail(): \
957# -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail-${ezjail_archive_tag}.norun: \
958# -s:"etc/fstab.${ezjail_safename}\$":fstab.ezjail: \
959# -s:"^\\.":ezjail: \
960# "${ezjail_config}" ${ezjail_addfiles} .
961
962 953
963 shift 1 954 shift 1
964 done 955 done