diff options
-rwxr-xr-x | ezjail-admin | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ezjail-admin b/ezjail-admin index 7f8876b..785cf15 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -993,7 +993,7 @@ setup|update) | |||
993 | # If ran from cron be kind to freebsds update servers and sleep first | 993 | # If ran from cron be kind to freebsds update servers and sleep first |
994 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" | 994 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" |
995 | [ "${ezjail_use_zfs}" = "YES" ] && zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` | 995 | [ "${ezjail_use_zfs}" = "YES" ] && zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` |
996 | freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install | 996 | env PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install |
997 | elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then | 997 | elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then |
998 | [ -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." | 998 | [ -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." |
999 | 999 | ||
@@ -1007,9 +1007,9 @@ setup|update) | |||
1007 | ezjail_osversion_target="`uname -r`" | 1007 | ezjail_osversion_target="`uname -r`" |
1008 | 1008 | ||
1009 | # Finally run freebsd-update to upgrade our basejail | 1009 | # Finally run freebsd-update to upgrade our basejail |
1010 | env UNAME_r="${ezjail_osversion_source}" freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} upgrade | 1010 | env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} upgrade |
1011 | while [ $? -eq 0 ]; do | 1011 | while [ $? -eq 0 ]; do |
1012 | env UNAME_r="${ezjail_osversion_source}" freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} install | 1012 | env UNAME_r="${ezjail_osversion_source}" PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} -r ${ezjail_osversion_target} install |
1013 | done | 1013 | done |
1014 | 1014 | ||
1015 | # Here we should write the file with the new osversion in case of success | 1015 | # Here we should write the file with the new osversion in case of success |
@@ -1183,7 +1183,7 @@ install) | |||
1183 | 1183 | ||
1184 | # Update to current patch level, split basejail and newjail | 1184 | # Update to current patch level, split basejail and newjail |
1185 | if [ "${ezjail_basesystem}" ]; then | 1185 | if [ "${ezjail_basesystem}" ]; then |
1186 | freebsd-update -b "${DESTDIR}" fetch install | 1186 | env PAGER=/bin/cat freebsd-update -b "${DESTDIR}" fetch install |
1187 | ezjail_splitworld | 1187 | ezjail_splitworld |
1188 | fi | 1188 | fi |
1189 | 1189 | ||