diff options
author | erdgeist <erdgeist@erdgeist.org> | 2008-01-08 03:34:48 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2008-01-08 03:34:48 +0000 |
commit | b4889a5d6b032264ec5e5fd85d48d97cf52ae3b6 (patch) | |
tree | a1b8b817cfa53db286949050c06bd26087dc9b0f /ezjail-admin | |
parent | 33c42bb8ceca67a76268f68a03a8db1928bc2a34 (diff) |
Format for property files in ezjail archive now changed to use - as seperator.
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin index 4bb361d..780a1bf 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -840,8 +840,8 @@ archive) | |||
840 | cd "${ezjail_rootdir}" || exerr "Error: can't cd to ${ezjail_root}." | 840 | cd "${ezjail_rootdir}" || exerr "Error: can't cd to ${ezjail_root}." |
841 | pax -wXtz -x ustar ${ezjail_archive_opt} \ | 841 | pax -wXtz -x ustar ${ezjail_archive_opt} \ |
842 | -s:"^[^\\.].*/ezjail\\.conf\$":ezjail.conf: \ | 842 | -s:"^[^\\.].*/ezjail\\.conf\$":ezjail.conf: \ |
843 | -s:"^[^\\.].*/${ezjail_safename}\$":prop.ezjail_${ezjail_archive_tag}: \ | 843 | -s:"^[^\\.].*/${ezjail_safename}\$":prop.ezjail-${ezjail_archive_tag}: \ |
844 | -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail_${ezjail_archive_tag}.norun: \ | 844 | -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail-${ezjail_archive_tag}.norun: \ |
845 | -s:"etc/fstab.${ezjail_safename}\$":fstab.ezjail: \ | 845 | -s:"etc/fstab.${ezjail_safename}\$":fstab.ezjail: \ |
846 | -s:"^\\.":ezjail: \ | 846 | -s:"^\\.":ezjail: \ |
847 | "/etc/fstab.${ezjail_safename}" "${ezjail_config}" "${ezjail_etc}/ezjail.conf" . 2> /dev/null | 847 | "/etc/fstab.${ezjail_safename}" "${ezjail_config}" "${ezjail_etc}/ezjail.conf" . 2> /dev/null |
@@ -898,6 +898,8 @@ restore) | |||
898 | 898 | ||
899 | ezjail_nameprop=`tar tzf ${ezjail_fromarchive} --fast-read prop.ezjail_\*` | 899 | ezjail_nameprop=`tar tzf ${ezjail_fromarchive} --fast-read prop.ezjail_\*` |
900 | [ $? -eq 0 -a "${ezjail_nameprop}" ] || exerr "Error: File ${ezjail_fromarchive} is not an ezjail archive." | 900 | [ $? -eq 0 -a "${ezjail_nameprop}" ] || exerr "Error: File ${ezjail_fromarchive} is not an ezjail archive." |
901 | |||
902 | echo "${ezjail_nameprop}" | ||
901 | 903 | ||
902 | 904 | ||
903 | shift 1 | 905 | shift 1 |