Author: cperciva
Date: Fri Oct 16 01:23:41 2015
New Revision: 289402
URL: https://svnweb.freebsd.org/changeset/base/289402
Log:
MFC r289065: Add --currently-running <release> option to freebsd-update.
Modified:
stable/10/usr.sbin/freebsd-update/freebsd-update.8
stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.8
==============================================================================
--- stable/10/usr.sbin/freebsd-update/freebsd-update.8 Fri Oct 16 01:19:55
2015 (r289401)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.8 Fri Oct 16 01:23:41
2015 (r289402)
@@ -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
Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Fri Oct 16 01:19:55
2015 (r289401)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Fri Oct 16 01:23:41
2015 (r289402)
@@ -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)
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
