From 438b0ed74b6a6b2964e73253cc8f94c2316c682e Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 14 Oct 2013 16:44:50 +0000
Subject: Fix a bug where ezjail-admin restore would not use the jail name from
 the archive when restoring from the archive and not from jail name. Thanks to
 Ollivier Robert for reporting

---
 ezjail-admin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ezjail-admin b/ezjail-admin
index 6638793..27aedb8 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1455,7 +1455,7 @@ restore)
     ezjail_config=`mktemp /tmp/ezjail.prop.XXXXXXXX`
     [ $? -ne 0 ] && exerr "Error: Can't create temporary file."
     pax -rzn -s:${ezjail_nameprop}:${ezjail_config}: -f ${ezjail_fromarchive} ${ezjail_nameprop}
-    fetchjailinfo ${ezjail_safename} ${ezjail_config}
+    fetchjailinfo ${ezjail_safename:-${ezjail_nameprop_safename}} ${ezjail_config}
 
     # 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."
-- 
cgit v1.2.3