summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2010-01-20 15:57:27 +0000
committererdgeist <erdgeist@erdgeist.org>2010-01-20 15:57:27 +0000
commitb3c31cfe15156b6e63b34fe467a58b7a253ced39 (patch)
tree225382ab4950616e3087843f9c5fae44e3b3318c
parent93d7e3aa542f1f5f3ba7582acd3591b12855b68c (diff)
If pax fails resetting access times, don't report archiving errors.
Do not automatically install the example's make.conf into template jail.
-rwxr-xr-xezjail-admin13
1 files changed, 3 insertions, 10 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 58104ed..fe84031 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -76,7 +76,7 @@ attach_images () {
76 ;; 76 ;;
77 eli) 77 eli)
78 echo "Attaching eli device for image jail ${ezjail}..." 78 echo "Attaching eli device for image jail ${ezjail}..."
79 echo geli attach ${ezjail_attachparams} "/dev/${ezjail_imagedevice}" | /bin/sh 79 echo geli attach ${ezjail_attachparams} "/dev/${ezjail_imagedevice}" | /bin/sh
80 [ $? -eq 0 ] || detach_images keep || exerr "Error: Attaching eli device failed." 80 [ $? -eq 0 ] || detach_images keep || exerr "Error: Attaching eli device failed."
81 # Device to mount is not md anymore 81 # Device to mount is not md anymore
82 ezjail_device="${ezjail_imagedevice}.eli" 82 ezjail_device="${ezjail_imagedevice}.eli"
@@ -273,13 +273,6 @@ ezjail_splitworld() {
273 # no /usr/ports? link to /basejail/usr/ports 273 # no /usr/ports? link to /basejail/usr/ports
274 [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports" 274 [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports"
275 275
276 # A ports collection inside jails is hardly useful w/o an appropriate
277 # /etc/make.conf.
278 if [ -f "${ezjail_examples}/example/etc/make.conf" -a ! -f "${ezjail_jailtemplate}/etc/make.conf" ]; then
279 cp -p "${ezjail_examples}/example/etc/make.conf" "${ezjail_jailtemplate}/etc/"
280 echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails."
281 fi
282
283 # The ugly perl hack[tm]. Note: we wont do such things for any given 276 # The ugly perl hack[tm]. Note: we wont do such things for any given
284 # port :( 277 # port :(
285 [ "${ezjail_uglyperlhack}" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl" 278 [ "${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 () {
327 320
328# Make a path absolute, if it isn't already 321# Make a path absolute, if it isn't already
329ezjail_makeabsolute ( ) { 322ezjail_makeabsolute ( ) {
330 eval [ \"\${$1%%[!/]*}\" -o "\${$1}" = "-" ] && return 323 eval [ \"\${$1%%[!/]*}\" -o \"\${$1}\" = \"-\" ] && return
331 [ "${2%%[!/]*}" ] && path=${2} || path=`pwd -P`/${2} 324 [ "${2%%[!/]*}" ] && path=${2} || path=`pwd -P`/${2}
332 eval export ${1}="${path}/\${$1}" 325 eval export ${1}="${path}/\${$1}"
333} 326}
@@ -1090,7 +1083,7 @@ archive)
1090 [ "${ezjail_imagesize}" ] && detach_images keep 1083 [ "${ezjail_imagesize}" ] && detach_images keep
1091 1084
1092 # An error on a jail not running is bad 1085 # An error on a jail not running is bad
1093 [ ${ezjail_paxresult} -eq 0 -o "${ezjail_force}" ] || exerr "Error: Archiving jail failed.\n You might want to check and remove ${ezjail_archive}." 1086 [ ${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}."
1094 1087
1095 # When archiving a running jail, some errors might occur 1088 # When archiving a running jail, some errors might occur
1096 [ ${ezjail_paxresult} -eq 0 ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful. For a running jail this is not unusual." 1089 [ ${ezjail_paxresult} -eq 0 ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful. For a running jail this is not unusual."