* Execute firmware upgrade in the background

* Reboot again from /etc/rc.firmware, not from the web gui.  This can be *dangerous* if the user cancels the update, navigates away from the page, etc.

2 files changed, 4 insertions, 3 deletions

diff --git a/etc/rc.firmware b/etc/rc.firmware
index 8b21977..7da6c04 100755
--- a/etc/rc.firmware
+++ b/etc/rc.firmware
@@ -112,6 +112,7 @@ upgrade)
 	/sbin/mount -r /cf
 
 	echo "Done."
+	/etc/rc.reboot
 	;;
 pfSenseupgrade)
 	# wait 5 seconds before beginning
@@ -160,6 +161,7 @@ pfSenseupgrade)
 	/sbin/mount -r /cf
 	
 	echo "Done." | logger -p daemon.info -i -t Upgrade
+	/etc/rc.reboot
 	;;
 delta_update)
 	backup_chflags
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index db48f2b..2362064 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -93,9 +93,8 @@ if ($_POST && !file_exists($d_firmwarelock_path)) {
 			if (!$input_errors && !file_exists($d_firmwarelock_path) && (!$sig_warning || $_POST['sig_override'])) {
 				/* fire up the update script in the background */
 				touch($d_firmwarelock_path);
-				$savemsg = "The firmware is now being installed. The firewall will reboot automatically.";
-				exec("/etc/rc.firmware pfSenseupgrade {$g['tmp_path']}/firmware.tgz");
-				exec("/etc/rc.reboot");
+				$savemsg = "The firmware is now being updated. The firewall will reboot automatically.";
+				mwexec_bg("/etc/rc.firmware pfSenseupgrade {$g['tmp_path']}/firmware.tgz");
 			}
 		}
 	}