diff options
-rwxr-xr-x | ezjail-admin | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ezjail-admin b/ezjail-admin index 0620d32..6e3fb69 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -1013,8 +1013,8 @@ setup|update) | |||
1013 | zfs snapshot ${ezjail_jailzfs}/basejail@`date +"%C%y%m%d_%H:%M:%S"` | 1013 | zfs snapshot ${ezjail_jailzfs}/basejail@`date +"%C%y%m%d_%H:%M:%S"` |
1014 | zfs snapshot ${ezjail_jailzfs}/newjail@`date +"%C%y%m%d_%H:%M:%S"` | 1014 | zfs snapshot ${ezjail_jailzfs}/newjail@`date +"%C%y%m%d_%H:%M:%S"` |
1015 | fi | 1015 | fi |
1016 | env PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install | 1016 | env PAGER=/bin/cat freebsd-update --not-running-from-cron -b ${ezjail_jailbase} ${ezjail_urgency} install |
1017 | env PAGER=/bin/cat freebsd-update -b ${ezjail_jailtemplate} ${ezjail_urgency} install | 1017 | env PAGER=/bin/cat freebsd-update --not-running-from-cron -b ${ezjail_jailtemplate} ${ezjail_urgency} install |
1018 | elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then | 1018 | elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then |
1019 | [ -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." | 1019 | [ -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." |
1020 | 1020 | ||
@@ -1029,9 +1029,9 @@ setup|update) | |||
1029 | 1029 | ||
1030 | # Finally run freebsd-update to upgrade our basejail | 1030 | # Finally run freebsd-update to upgrade our basejail |
1031 | for DESTDIR in ${ezjail_jailbase} ${ezjail_jailtemplate}; do | 1031 | for DESTDIR in ${ezjail_jailbase} ${ezjail_jailtemplate}; do |
1032 | env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update -b ${DESTDIR} -r ${ezjail_osversion_target} upgrade | 1032 | env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update --not-running-from-cron -b ${DESTDIR} -r ${ezjail_osversion_target} upgrade |
1033 | while [ $? -eq 0 ]; do | 1033 | while [ $? -eq 0 ]; do |
1034 | env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update -b ${DESTDIR} -r ${ezjail_osversion_target} install | 1034 | env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update --not-running-from-cron -b ${DESTDIR} -r ${ezjail_osversion_target} install |
1035 | done | 1035 | done |
1036 | done | 1036 | done |
1037 | 1037 | ||
@@ -1212,7 +1212,7 @@ install) | |||
1212 | 1212 | ||
1213 | # Update to current patch level, split basejail and newjail | 1213 | # Update to current patch level, split basejail and newjail |
1214 | if [ "${ezjail_basesystem}" ]; then | 1214 | if [ "${ezjail_basesystem}" ]; then |
1215 | env PAGER=/bin/cat freebsd-update -b "${DESTDIR}" --currently-running "${ezjail_release}" fetch install | 1215 | env PAGER=/bin/cat freebsd-update --not-running-from-cron -b "${DESTDIR}" --currently-running "${ezjail_release}" fetch install |
1216 | ezjail_splitworld | 1216 | ezjail_splitworld |
1217 | fi | 1217 | fi |
1218 | 1218 | ||