diff options
author | erdgeist <erdgeist@erdgeist.org> | 2013-10-14 16:44:50 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2013-10-14 16:44:50 +0000 |
commit | 438b0ed74b6a6b2964e73253cc8f94c2316c682e (patch) | |
tree | 5b56fcbcc5abfd8c9f5ab0082956434819c6f173 /ezjail-admin | |
parent | 4af41642cae3c65b917ee98265ef334880639ea0 (diff) |
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
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin index 6638793..27aedb8 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -1455,7 +1455,7 @@ restore) | |||
1455 | ezjail_config=`mktemp /tmp/ezjail.prop.XXXXXXXX` | 1455 | ezjail_config=`mktemp /tmp/ezjail.prop.XXXXXXXX` |
1456 | [ $? -ne 0 ] && exerr "Error: Can't create temporary file." | 1456 | [ $? -ne 0 ] && exerr "Error: Can't create temporary file." |
1457 | pax -rzn -s:${ezjail_nameprop}:${ezjail_config}: -f ${ezjail_fromarchive} ${ezjail_nameprop} | 1457 | pax -rzn -s:${ezjail_nameprop}:${ezjail_config}: -f ${ezjail_fromarchive} ${ezjail_nameprop} |
1458 | fetchjailinfo ${ezjail_safename} ${ezjail_config} | 1458 | fetchjailinfo ${ezjail_safename:-${ezjail_nameprop_safename}} ${ezjail_config} |
1459 | 1459 | ||
1460 | # Now all parameters are here, invoke ezjail-admin create | 1460 | # Now all parameters are here, invoke ezjail-admin create |
1461 | [ "${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." | 1461 | [ "${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." |