From 6c44af6f908390fda803364b1d4155b949fe0242 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 19 May 2008 09:33:38 +0000
Subject: Fix quoting errors.

---
 ezjail-admin | 13 ++-----------
 1 file 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)
 
     # Catch all errors that will likely create a broken backup
     [ "${ezjail_safename}" -a "${ezjail_safename}" != "${ezjail_nameprop_safename}" ] && exerr "Error: Archive name ${ezjail_fromarchive} does not match archived jail ${ezjail_nameprop_safename}."
-    [ "${ezjail_hsname}" != "${ezjail_nameprop_hsname}" ] && exerr "Error: Can only use restore on the same machine. Consider using \"ezjail-admin create -a\" when migrating ezjails."
-    [ "${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."
-
-    # BIG security hole here. Must trust content of archive
-#    pax -wzXt -x ustar ${ezjail_fromarchive} \
-#      -s:prop.ezjail(): \
-#      -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail-${ezjail_archive_tag}.norun: \
-#      -s:"etc/fstab.${ezjail_safename}\$":fstab.ezjail: \
-#      -s:"^\\.":ezjail: \
-#      "${ezjail_config}" ${ezjail_addfiles} .
-
+    [ "${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."
+    [ "${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."
 
     shift 1
   done
-- 
cgit v1.2.3