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

If pax fails resetting access times, don't report archiving errors.

Browse Source 
Do not automatically install the example's make.conf into template jail.
This commit is contained in:
erdgeist 2010-01-20 15:57:27 +00:00
parent 93d7e3aa54
commit b3c31cfe15
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ezjail-admin
View File

@ -273,13 +273,6 @@ ezjail_splitworld() {
# no /usr/ports? link to /basejail/usr/ports # no /usr/ports? link to /basejail/usr/ports
[ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports" [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports"
# A ports collection inside jails is hardly useful w/o an appropriate
# /etc/make.conf.
if [ -f "${ezjail_examples}/example/etc/make.conf" -a ! -f "${ezjail_jailtemplate}/etc/make.conf" ]; then
cp -p "${ezjail_examples}/example/etc/make.conf" "${ezjail_jailtemplate}/etc/"
echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails."
fi
# The ugly perl hack[tm]. Note: we wont do such things for any given # The ugly perl hack[tm]. Note: we wont do such things for any given
# port :( # port :(
[ "${ezjail_uglyperlhack}" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl" [ "${ezjail_uglyperlhack}" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl"
@ -327,7 +320,7 @@ ezjail_queryftpserver () {
# Make a path absolute, if it isn't already # Make a path absolute, if it isn't already
ezjail_makeabsolute ( ) { ezjail_makeabsolute ( ) {
eval [ \"\${$1%%[!/]*}\" -o "\${$1}" = "-" ] && return eval [ \"\${$1%%[!/]*}\" -o \"\${$1}\" = \"-\" ] && return
[ "${2%%[!/]*}" ] && path=${2} || path=`pwd -P`/${2} [ "${2%%[!/]*}" ] && path=${2} || path=`pwd -P`/${2}
eval export ${1}="${path}/\${$1}" eval export ${1}="${path}/\${$1}"
} }
@ -1090,7 +1083,7 @@ archive)
[ "${ezjail_imagesize}" ] && detach_images keep [ "${ezjail_imagesize}" ] && detach_images keep
# An error on a jail not running is bad # An error on a jail not running is bad
[ ${ezjail_paxresult} -eq 0 -o "${ezjail_force}" ] || exerr "Error: Archiving jail failed.\n You might want to check and remove ${ezjail_archive}." [ ${ezjail_paxresult} -eq 0 -o "${ezjail_force}" ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful.\n Please refer to the output above for problems the archiving tool encountered.\n You may ignore reports concerning setting access and modification times.\n You might want to check and remove ${ezjail_archive}."
# When archiving a running jail, some errors might occur # When archiving a running jail, some errors might occur
[ ${ezjail_paxresult} -eq 0 ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful. For a running jail this is not unusual." [ ${ezjail_paxresult} -eq 0 ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful. For a running jail this is not unusual."