update: add `-l' for offline usage

While there, mop up MIRROR and FLAVOUR style after their revamp
for version 16.1.6.

update/opnsense-update.8

@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2015 Franco Fichtner <franco@opnsense.org>
+.\" Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -33,6 +33,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl bfikps
+.Op Fl l Ar directory
 .Op Fl m Ar mirror
 .Op Fl n Ar flavour
 .Op Fl r Ar release
@@ -56,7 +57,7 @@ The default is
 attempting to update all components at once.
 .Pp
 The options are as follows:
-.Bl -tag -width ".Fl r Ar release" -offset indent
+.Bl -tag -width ".Fl l Ar directory" -offset indent
 .It Fl b
 Update the base system only.
 .It Fl c
@@ -67,6 +68,9 @@ Force an update even when the latest release is already installed.
 Ignore the signature verification result.
 .It Fl k
 Update the kernel only.
+.It Fl l Ar directory
+Instead of downloading, point to a local directory where the base and
+kernel sets are stored.
 .It Fl m Ar mirror
 Change the set fetch and package location to
 .Ar mirror .

update/opnsense-update.sh

@@ -59,12 +59,13 @@ DO_RELEASE=
 DO_FLAVOUR=
 DO_MIRROR=
 DO_KERNEL=
+DO_LOCAL=
 DO_FORCE=
 DO_BASE=
 DO_PKGS=
 DO_SKIP=
 
-while getopts bcfikm:n:pr:sv OPT; do
+while getopts bcfikl:m:n:pr:sv OPT; do
 	case ${OPT} in
 	b)
 		DO_BASE="-b"
@@ -86,13 +87,14 @@ while getopts bcfikm:n:pr:sv OPT; do
 	k)
 		DO_KERNEL="-k"
 		;;
+	l)
+		DO_LOCAL="-l ${OPTARG}"
+		;;
 	m)
 		DO_MIRROR="-m ${OPTARG}"
-		MIRROR=${OPTARG}
 		;;
 	n)
 		DO_FLAVOUR="-n ${OPTARG}"
-		FLAVOUR=${OPTARG}
 		;;
 	p)
 		DO_PKGS="-p"
@@ -124,7 +126,7 @@ fi
 
 if [ -n "${DO_FLAVOUR}" ]; then
 	# replace the package repo name
-	sed -i '' '/'"${URL_KEY}"'/s/${ABI}.*/${ABI}\/'"${FLAVOUR}"'\",/' ${ORIGIN}
+	sed -i '' '/'"${URL_KEY}"'/s/${ABI}.*/${ABI}\/'"${DO_FLAVOUR#"-n "}"'\",/' ${ORIGIN}
 fi
 
 if [ -n "${DO_MIRROR}" ]; then
@@ -144,7 +146,7 @@ if [ -n "${DO_PKGS}" ]; then
 	pkg clean -ya
 	if [ -n "${DO_BASE}${DO_KERNEL}" ]; then
 		# script may have changed, relaunch...
-		opnsense-update ${DO_BASE} ${DO_KERNEL} \
+		opnsense-update ${DO_BASE} ${DO_KERNEL} ${DO_LOCAL} \
 		    ${DO_FORCE} ${DO_RELEASE} ${DO_MIRROR}
 	fi
 	# stop here to prevent the second pass
@@ -189,12 +191,22 @@ BASESET=base-${RELEASE}-${ARCH}.txz
 WORKDIR=${WORKPREFIX}/${$}
 KERNELDIR=/boot/kernel
 
+if [ -n "${DO_LOCAL}" ]; then
+	WORKDIR=${DO_LOCAL#"-l "}
+fi
+
 fetch_set()
 {
 	STAGE1="fetch -q ${MIRROR}/sets/${1}.sig -o ${WORKDIR}/${1}.sig"
 	STAGE2="fetch -q ${MIRROR}/sets/${1} -o ${WORKDIR}/${1}"
 	STAGE3="opnsense-verify -q ${WORKDIR}/${1}"
 
+	if [ -n "${DO_LOCAL}" ]; then
+		# already fetched, just test
+		STAGE1="test -f ${WORKDIR}/${1}.sig"
+		STAGE2="test -f ${WORKDIR}/${1}"
+	fi
+
 	if [ -n "${DO_INSECURE}" ]; then
 		# no signature, no cry
 		STAGE1=":"
@@ -290,6 +302,8 @@ if [ -n "${DO_BASE}" ]; then
 	echo ${RELEASE}-${ARCH} > ${MARKER}.base
 fi
 
-rm -rf ${WORKDIR}
+if [ -z "${DO_LOCAL}" ]; then
+	rm -rf ${WORKDIR}
+fi
 
 echo "Please reboot."