ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some bugs in stdout archive code

Browse Source
This commit is contained in:
erdgeist 2007-11-27 23:01:32 +00:00
parent a1d5d32554
commit 17df3ac4c4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ezjail-admin
View File

@ -826,18 +826,19 @@ archive)
[ "${ezjail_archive}" ] || ezjail_archive="${ezjail_archive_tag}.tar.gz" [ "${ezjail_archive}" ] || ezjail_archive="${ezjail_archive_tag}.tar.gz"
# if archive location is not absolute, prepend archive directory # if archive location is not absolute, prepend archive directory
[ "${ezjail_archive%%[!/]*}" -a ${ezjail_archive} != "-" ] || ezjail_archive="${ezjail_archivedir}/${ezjail_archive}" [ "${ezjail_archive%%[!/]*}" -o ${ezjail_archive} = "-" ] || ezjail_archive="${ezjail_archivedir}/${ezjail_archive}"
# It's a tar archive, after all # It's a tar archive, after all
case ${ezjail_archive} in case ${ezjail_archive} in
-) unset ezjail_archive_opt;; *.tar.gz|*.tgz|-) ;;
*) ezjail_archive="${ezjail_archive}.tar.gz" *) ezjail_archive="${ezjail_archive}.tar.gz";;
# Fall through intended
*.tar.gz|*.tgz) ezjail_archive_opt="-f ${ezjail_archive}";;
esac esac
# For stdout do specify nothing
[ "${ezjail_archive}" = "-" ] && unset ezjail_archive_opt || ezjail_archive_opt="-f ${ezjail_archive}"
cd "${ezjail_rootdir}" || exerr "Error: can't cd to ${ezjail_root}." cd "${ezjail_rootdir}" || exerr "Error: can't cd to ${ezjail_root}."
pax -wXtz -x ustar "${ezjail_archive_opt}" \ pax -wXtz -x ustar ${ezjail_archive_opt} \
-s:"^[^\\.].*/ezjail\\.conf\$":ezjail.conf: \ -s:"^[^\\.].*/ezjail\\.conf\$":ezjail.conf: \
-s:"^[^\\.].*/${ezjail_safename}\$":prop.ezjail_${ezjail_archive_tag}: \ -s:"^[^\\.].*/${ezjail_safename}\$":prop.ezjail_${ezjail_archive_tag}: \
-s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail_${ezjail_archive_tag}.norun: \ -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail_${ezjail_archive_tag}.norun: \
@ -853,7 +854,7 @@ archive)
# To the next jail on command line # To the next jail on command line
shift 1 shift 1
unset ezjail_archive unset ezjail_archive ezjail_archive_opt
done done
;; ;;
####################### ezjail-admin RESTORE ######################## ####################### ezjail-admin RESTORE ########################