diff options
author | Colin Percival <cperciva@FreeBSD.org> | 2015-10-09 12:34:33 +0000 |
---|---|---|
committer | Colin Percival <cperciva@FreeBSD.org> | 2015-10-09 12:34:33 +0000 |
commit | b39ce43e4ca47756addcd1ad0d49cfc0e7d3bcea (patch) | |
tree | 030c0bb5b23b56f3571413206e2d985ebdd982ac /usr.sbin/freebsd-update | |
parent | 8d90e66066c374cb73e232ee0312837a8e4f05c4 (diff) | |
download | src-b39ce43e4ca47756addcd1ad0d49cfc0e7d3bcea.tar.gz src-b39ce43e4ca47756addcd1ad0d49cfc0e7d3bcea.zip |
Add --currently-running <release> option to freebsd-update.
This option tells freebsd-update to act as if it is running a specific
release instead of querying the kernel. In particular, this can be
useful when upgrading jails.
Requested by: EuroBSDCon devsummit jails session
Tested by: allanjude
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=289065
Diffstat (limited to 'usr.sbin/freebsd-update')
-rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.8 | 5 | ||||
-rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 5 |
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 dcba710166b2..c0c9ae05ae7d 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 19d519881e79..9fcc01214755 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) |