summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.85
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh5
2 files changed, 10 insertions, 0 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index 02b9b00..a9caff6 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -113,6 +113,11 @@ Please do not run
.Nm Cm fetch
from crontab or similar using this flag, see:
.Nm Cm cron
+.It Fl -currently-running Ar release
+Don't detect the currently-running release; instead, assume that the
+system is running the specified
+.Ar release .
+This is most likely to be useful when upgrading jails.
.El
.Sh COMMANDS
The
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index 19d5198..9fcc012 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -52,6 +52,8 @@ Options:
(default: root)
--not-running-from-cron
-- Run without a tty, for use by automated tools
+ --currently-running release
+ -- Update as if currently running this release
Commands:
fetch -- Fetch updates from server
cron -- Sleep rand(3600) seconds, fetch updates, and send an
@@ -434,6 +436,9 @@ parse_cmdline () {
--not-running-from-cron)
NOTTYOK=1
;;
+ --currently-running)
+ shift; export UNAME_r="$1"
+ ;;
# Configuration file equivalents
-b)
OpenPOWER on IntegriCloud