From fd1df9a99b64a67384bef26f4f416f0931393f3a Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 17 May 2013 21:14:48 +0000 Subject: We don't want the forces freebsd-update pagers in our scripts --- ezjail-admin | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ezjail-admin') diff --git a/ezjail-admin b/ezjail-admin index 7f8876b..785cf15 100755 --- a/ezjail-admin +++ b/ezjail-admin @@ -993,7 +993,7 @@ setup|update) # If ran from cron be kind to freebsds update servers and sleep first [ -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"` - 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 [ -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`" # 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 - 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 # 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 if [ "${ezjail_basesystem}" ]; then - freebsd-update -b "${DESTDIR}" fetch install + env PAGER=/bin/cat freebsd-update -b "${DESTDIR}" fetch install ezjail_splitworld fi -- cgit v1.2.3