svn commit: r382788 - in head/sysutils/firstboot-freebsd-update: . files
Colin Percival
cperciva at FreeBSD.org
Tue Mar 31 01:26:20 UTC 2015
Author: cperciva
Date: Tue Mar 31 01:26:19 2015
New Revision: 382788
URL: https://svnweb.freebsd.org/changeset/ports/382788
QAT: https://qat.redports.org/buildarchive/r382788/
Log:
Teach the firstboot-freebsd-update script to disable itself if it is run
on something other than *-BETA*, *-RC*, or *-RELEASE*. There won't be
any bits available to download, and if we don't disable it then the first
boot will be slowed down due to freebsd-update trying all of the available
mirrors.
Modified:
head/sysutils/firstboot-freebsd-update/Makefile
head/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in
Modified: head/sysutils/firstboot-freebsd-update/Makefile
==============================================================================
--- head/sysutils/firstboot-freebsd-update/Makefile Mon Mar 30 23:25:33 2015 (r382787)
+++ head/sysutils/firstboot-freebsd-update/Makefile Tue Mar 31 01:26:19 2015 (r382788)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= firstboot-freebsd-update
-PORTVERSION= 1.1
+PORTVERSION= 1.2
CATEGORIES= sysutils
MASTER_SITES= # none
DISTFILES= # none
Modified: head/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in
==============================================================================
--- head/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in Mon Mar 30 23:25:33 2015 (r382787)
+++ head/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in Tue Mar 31 01:26:19 2015 (r382788)
@@ -9,10 +9,18 @@
# image, since this only runs on the first boot) to enable this:
#
# firstboot_freebsd_update_enable="YES"
+#
+# By default this script will only run on *-BETA*, *-RC*, and *-RELEASE*
+# systems, since those are the only ones for which updates are provided by
+# the FreeBSD project; to run freebsd-update anyway (e.g., on a custom
+# release for which you are providing your own update bits), set:
+#
+# firstboot_freebsd_update_nonstandard="YES"
. /etc/rc.subr
: ${firstboot_freebsd_update_enable:="NO"}
+: ${firstboot_freebsd_update_nonstandard:="NO"}
name="firstboot_freebsd_update"
rcvar=firstboot_freebsd_update_enable
@@ -22,6 +30,17 @@ stop_cmd=":"
firstboot_freebsd_update_run()
{
+ if ! checkyesno firstboot_freebsd_update_nonstandard; then
+ case "`uname -r`" in
+ *-BETA* | *-RC* | *-RELEASE*)
+ ;;
+ *)
+ echo "Firstboot freebsd-update disabled on `uname -r`"
+ return 0
+ ;;
+ esac
+ fi
+
freebsd-update fetch
if [ -e /var/db/freebsd-update/`echo / | sha256`-install ]; then
freebsd-update install
More information about the svn-ports-head
mailing list