firmware: plug console update into locking and progress

We do not want to have rc.firmware use the other scripts for
a number of reasons...

* Don't jump through configd in case it's dysfunct
* Don't use the normal script in case it's gone
* tee(1) output so that the console works as usual

src/etc/rc.firmware

 #!/bin/sh
 
-# Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 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
@@ -25,21 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-set -e
+LOCKFILE="/tmp/pkg_upgrade.progress"
+FLOCK="/usr/local/bin/flock -n -o"
 
-# upgrade all packages if possible
-opnsense-update -p
-
-echo
-
-# trigger a webgui restart to cope with changes
-/usr/local/etc/rc.restart_webgui
-
-echo
-
-# if we can update base, we'll do that as well
-if opnsense-update -c; then
-	if opnsense-update -bk; then
-		/usr/local/etc/rc.reboot
-	fi
-fi
+${FLOCK} ${LOCKFILE} /usr/local/etc/rc.firmware.subr

src/etc/rc.firmware.subr

+#!/bin/sh
+
+# 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
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+LOCKFILE="/tmp/pkg_upgrade.progress"
+TEE="/usr/bin/tee -a"
+
+: > ${LOCKFILE}
+
+echo "***GOT REQUEST TO UPGRADE: all***" >> ${LOCKFILE}
+
+# upgrade all packages if possible
+opnsense-update -p 2>&1 | ${TEE} ${LOCKFILE}
+
+# trigger a webgui restart to cope with changes
+/usr/local/etc/rc.restart_webgui 2>&1 | ${TEE} ${LOCKFILE}
+
+# if we can update base, we'll do that as well
+if opnsense-update -c; then
+	if opnsense-update -bk 2>&1 | ${TEE} ${LOCKFILE}; then
+		echo '***REBOOT***' >> ${LOCKFILE}
+		sleep 5
+		/usr/local/etc/rc.reboot
+	fi
+fi
+
+echo '***DONE***' >> ${LOCKFILE}