summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2009-08-21 12:03:19 +0000
committererdgeist <erdgeist@erdgeist.org>2009-08-21 12:03:19 +0000
commit3590f5daf3b2e4102f0aff20975ec032f81c360f (patch)
tree2bc15a5cf368d4ce0da13eb75ee55500b43d1faa
parent8420b5c98f585b3b57a7ce1ec85466cbe7651bdf (diff)
Make archive use the cpio archive format. Also fix some Warning message.
-rwxr-xr-xezjail-admin4
1 files changed, 2 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 1526d83..ec600d1 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -991,7 +991,7 @@ archive)
991 991
992 # If jail is still running, refuse to go any further - unless forced 992 # If jail is still running, refuse to go any further - unless forced
993 if [ "${ezjail_id}" -a -z "${ezjail_force}" ]; then 993 if [ "${ezjail_id}" -a -z "${ezjail_force}" ]; then
994 echo -e "Warning: Jail ${ezjail_name} appears to be still running.\n Stop it first, or use '${ezjail_admin} -f ${ezjail_name}' to force archiving." 994 echo -e "Warning: Jail ${ezjail_name} appears to be still running.\n Stop it first, or use '${ezjail_admin} archive -f ${ezjail_name}' to force archiving."
995 continue 995 continue
996 fi 996 fi
997 997
@@ -1036,7 +1036,7 @@ archive)
1036 [ -f "/etc/fstab.${ezjail_safename}" ] && ezjail_addfiles=/etc/fstab.${ezjail_safename} 1036 [ -f "/etc/fstab.${ezjail_safename}" ] && ezjail_addfiles=/etc/fstab.${ezjail_safename}
1037 1037
1038 cd "${ezjail_rootdir}" || exerr "Error: Can't cd to ${ezjail_root}." 1038 cd "${ezjail_rootdir}" || exerr "Error: Can't cd to ${ezjail_root}."
1039 pax -wzXt -x posix ${ezjail_archive_opt} \ 1039 pax -wzXt -x cpio ${ezjail_archive_opt} \
1040 -s:"^[^\\.].*/${ezjail_safename}\$":prop.ezjail-${ezjail_archive_tag}: \ 1040 -s:"^[^\\.].*/${ezjail_safename}\$":prop.ezjail-${ezjail_archive_tag}: \
1041 -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail-${ezjail_archive_tag}.norun: \ 1041 -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail-${ezjail_archive_tag}.norun: \
1042 -s:"etc/fstab.${ezjail_safename}\$":fstab.ezjail: \ 1042 -s:"etc/fstab.${ezjail_safename}\$":fstab.ezjail: \