From 628a6a88d38780b8d4044824ae0a8f599d51b4dc Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 9 Jul 2008 21:59:28 +0000 Subject: Embarrassing boolean expression mistake --- ezjail-admin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ezjail-admin b/ezjail-admin index fef82cc..1369e3b 100755 --- a/ezjail-admin +++ b/ezjail-admin @@ -987,8 +987,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}" && -z "${ezjail_forcerestore}" ] && exerr "Error: Archive was created on host named ${ezjail_hsname}. Consider using \"ezjail-admin create -a\" when migrating ezjails or -f to force restore." - [ "${ezjail_hscpu}" != "${ezjail_nameprop_hscpu}" && -z "${ezjail_forcerestore}" ] && exerr "Error: Archive was created on a different CPU. Can not restore. Consider using \"ezjail-admin create -a\" when migrating ezjails or -f to force restore." + [ "${ezjail_hsname}" != "${ezjail_nameprop_hsname}" -a -z "${ezjail_forcerestore}" ] && exerr "Error: Archive was created on host named ${ezjail_hsname}. Consider using \"ezjail-admin create -a\" when migrating ezjails or -f to force restore." + [ "${ezjail_hscpu}" != "${ezjail_nameprop_hscpu}" -a -z "${ezjail_forcerestore}" ] && exerr "Error: Archive was created on a different CPU. Can not restore. Consider using \"ezjail-admin create -a\" when migrating ezjails or -f to force restore." # Save config to tempfile and source it ezjail_config=`mktemp /tmp/ezjail.prop.XXXXXXXX` -- cgit v1.2.3