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

We don't want the forces freebsd-update pagers in our scripts

Browse Source
This commit is contained in:
erdgeist 2013-05-17 21:14:48 +00:00
parent cf8fbae481
commit fd1df9a99b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ezjail-admin
View File

@ -993,7 +993,7 @@ setup|update)
# If ran from cron be kind to freebsds update servers and sleep first # If ran from cron be kind to freebsds update servers and sleep first
[ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch"
[ "${ezjail_use_zfs}" = "YES" ] && zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` [ "${ezjail_use_zfs}" = "YES" ] && zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"`
freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install env PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install
elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then
[ -d "${ezjail_jailbase}" ] || exerr "Error: base jail does not exist.\n You cannot update a base jail until it is created.\n Please run '${ezjail_admin} update' or '${ezjail_admin} install' first." [ -d "${ezjail_jailbase}" ] || exerr "Error: base jail does not exist.\n You cannot update a base jail until it is created.\n Please run '${ezjail_admin} update' or '${ezjail_admin} install' first."
@ -1007,9 +1007,9 @@ setup|update)
ezjail_osversion_target="`uname -r`" ezjail_osversion_target="`uname -r`"
# Finally run freebsd-update to upgrade our basejail # Finally run freebsd-update to upgrade our basejail
env UNAME_r="${ezjail_osversion_source}" freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} upgrade env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} upgrade
while [ $? -eq 0 ]; do while [ $? -eq 0 ]; do
env UNAME_r="${ezjail_osversion_source}" freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} install env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} install
done done
# Here we should write the file with the new osversion in case of success # Here we should write the file with the new osversion in case of success
@ -1183,7 +1183,7 @@ install)
# Update to current patch level, split basejail and newjail # Update to current patch level, split basejail and newjail
if [ "${ezjail_basesystem}" ]; then if [ "${ezjail_basesystem}" ]; then
freebsd-update -b "${DESTDIR}" fetch install env PAGER=/bin/cat freebsd-update -b "${DESTDIR}" fetch install
ezjail_splitworld ezjail_splitworld
fi fi