From 3a4bae522fe391655ab3068e7a1635e004a728bb Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Fri, 16 Sep 2016 16:29:49 -0300
Subject: Add 'now' parameter do do_reboot() to force it to happen immediately

---
 src/usr/local/sbin/pfSense-upgrade | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'src/usr/local/sbin')

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index 0fdb326..0a5d68f 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -713,12 +713,25 @@ pkg_delete_all() {
 }
 
 do_reboot() {
+	local _now="$1"
+
+	local _msg=""
+	if [ "${_now}" = "now" ]; then
+		_msg="now."
+	else
+		_msg="in ${reboot_after} seconds."
+	fi
+
 	if [ -z "${dont_reboot}" ]; then
-		_echo "Upgrade is complete.  Rebooting in ${reboot_after} seconds."
-		echo "Upgrade is complete.  Rebooting in ${reboot_after} seconds." | wall
-		/etc/rc.notify_message -e -g -m "Upgrade is complete.  Rebooting in ${reboot_after} seconds." \
+		_echo "Upgrade is complete.  Rebooting ${_msg}"
+		echo "Upgrade is complete.  Rebooting ${_msg}" | wall
+		/etc/rc.notify_message -e -g -m "Upgrade is complete.  Rebooting ${_msg}" \
 			>/dev/null 2>&1
-		(sleep ${reboot_after} && /etc/rc.reboot) &
+		if [ "${_now}" = "now" ]; then
+			/etc/rc.reboot
+		else
+			(sleep ${reboot_after} && /etc/rc.reboot) &
+		fi
 	else
 		_echo "Upgrade is complete."
 		echo "Upgrade is complete." | wall
-- 
cgit v1.1