.

Author: sopex

src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php

@@ -461,19 +461,20 @@ public function poweroffAction()
      */
     public function updateAction()
     {
-        if ($this->request->isPost() && $this->request->getPost('shutdown') === '1') {
-            touch('/tmp/firmware_shutdown.flag');
         $backend = new Backend();
         $response = [];
         if ($this->request->isPost()) {
             $this->getLogger('audit')->notice(sprintf("[Firmware] User %s executed a firmware update", $this->getUserName()));
             $backend->configdRun('firmware flush');
-            $response['msg_uuid'] = trim($backend->configdRun('firmware update', true));
+
+            $cmd = 'firmware update';
+            if ($this->request->getPost('shutdown') === '1') {
+                $cmd .= ' shutdown';
+            }
+
+            $response['msg_uuid'] = trim($backend->configdRun($cmd, true));
             $response['status'] = 'ok';
-        } else {
-            $response['status'] = 'failure';
         }
-
         return $response;
     }
 
@@ -484,19 +485,20 @@ public function updateAction()
      */
     public function upgradeAction()
     {
-        if ($this->request->isPost() && $this->request->getPost('shutdown') === '1') {
-            touch('/tmp/firmware_shutdown.flag');
         $backend = new Backend();
         $response = [];
         if ($this->request->isPost()) {
             $this->getLogger('audit')->notice(sprintf("[Firmware] User %s executed a firmware upgrade", $this->getUserName()));
             $backend->configdRun('firmware flush');
-            $response['msg_uuid'] = trim($backend->configdRun('firmware upgrade', true));
+
+            $cmd = 'firmware upgrade';
+            if ($this->request->getPost('shutdown') === '1') {
+                $cmd .= ' shutdown';
+            }
+
+            $response['msg_uuid'] = trim($backend->configdRun($cmd, true));
             $response['status'] = 'ok';
-        } else {
-            $response['status'] = 'failure';
         }
-
         return $response;
     }
 
@@ -572,8 +574,6 @@ public function auditAction()
      */
     public function reinstallAction($pkg_name)
     {
-        if ($this->request->isPost() && $this->request->getPost('shutdown') === '1') {
-            touch('/tmp/firmware_shutdown.flag');
         $backend = new Backend();
         $response = [];
 
@@ -775,7 +775,7 @@ public function upgradestatusAction()
             $result['status'] = 'done';
         } elseif (strpos($cmd_result, '***REBOOT***') !== false) {
             $result['status'] = 'reboot';
-        } elseif (strpos($cmd_result, '***SHUTDOWN***') !== false) {
+        } elseif (strpos($cmd_result, '***POWER OFF***') !== false) {
             $result['status'] = 'shutdown';
         }
 

src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt

@@ -202,15 +202,14 @@
             // reboot required, inform the user.
             BootstrapDialog.show({
                 type:BootstrapDialog.TYPE_WARNING,
-                title: "{{ lang._('Reboot/ Power off required') }}",
-                message: "{{ lang._('The firewall will reboot directly after this set reinstall.') }}" + '<br><br><label><input type="checkbox" id="reinstall_shutdown_cb"> ' + '{{ lang._("Power off instead of reboot") }}</label>',
+                title: "{{ lang._('Reboot required') }}",
+                message: "{{ lang._('The firewall will reboot directly after this set reinstall.') }}",
                 buttons: [{
                     label: "{{ lang._('OK') }}",
                     cssClass: 'btn-warning',
                     action: function(dialogRef){
-                        let doShutdown = $('#reinstall_shutdown_cb').is(':checked') ? '1' : '0';
                         dialogRef.close();
-                        backend(pkg_act + "/" + pkg_name, {'shutdown': doShutdown});
+                        backend(pkg_act + "/" + pkg_name);
                     }
                 },{
                     label: "{{ lang._('Cancel') }}",

src/opnsense/scripts/firmware/config.sh

@@ -152,12 +152,7 @@ output_done()
 output_restart_action()
 {
 	KEEP_LOG=${1}
-	PREFER_SHUTDOWN=0
-
-	if [ -f /tmp/firmware_shutdown.flag ]; then
-		PREFER_SHUTDOWN=1
-		rm -f /tmp/firmware_shutdown.flag
-	fi
+	PREFER_SHUTDOWN=${2:-0}
 
 	if [ "${PREFER_SHUTDOWN}" = "1" ]; then
 		output_shutdown "${KEEP_LOG}"

src/opnsense/scripts/firmware/reinstall.sh

@@ -35,7 +35,7 @@ if [ "${PACKAGE}" = "base" ]; then
 	if opnsense-update -Tb; then
 		# force reinstall intended
 		if output_cmd opnsense-update -bf; then
-			output_restart_action
+			output_reboot
 		fi
 	else
 		# for locked message only
@@ -45,7 +45,7 @@ elif [ "${PACKAGE}" = "kernel" ]; then
 	if opnsense-update -Tk; then
 		# force reinstall intended
 		if output_cmd opnsense-update -kf; then
-			output_restart_action
+			output_reboot
 		fi
 	else
 		# for locked message only

src/opnsense/scripts/firmware/update.sh

@@ -29,6 +29,14 @@ REQUEST="UPDATE"
 
 . /usr/local/opnsense/scripts/firmware/config.sh
 
+PREFER_SHUTDOWN=0
+for arg in "$@"; do
+	if [ "$arg" = "shutdown" ]; then
+		PREFER_SHUTDOWN=1
+		break
+	fi
+done
+
 CMD=${1}
 FORCE=
 
@@ -71,13 +79,13 @@ fi
 # if we can update base, we'll do that as well
 if opnsense-update ${FORCE} -bk -c; then
 	if output_cmd opnsense-update ${FORCE} -bk; then
-		output_restart_action keep-log
+		output_restart_action keep-log ${PREFER_SHUTDOWN}
 	fi
 fi
 
 if [ "${ALWAYS_REBOOT}" = "1" ]; then
 	if [ "${PKGS_HASH}" != "$(${PKG} query %n-%v 2> /dev/null | sha256)" ]; then
-		output_restart_action keep-log
+		output_restart_action keep-log ${PREFER_SHUTDOWN}
 	fi
 fi
 

src/opnsense/scripts/firmware/upgrade.sh

@@ -29,13 +29,21 @@ REQUEST="UPGRADE"
 
 . /usr/local/opnsense/scripts/firmware/config.sh
 
+PREFER_SHUTDOWN=0
+for arg in "$@"; do
+	if [ "$arg" = "shutdown" ]; then
+		PREFER_SHUTDOWN=1
+		break
+	fi
+done
+
 if output_cmd opnsense-update -u; then
 	if output_cmd /usr/local/etc/rc.syshook upgrade; then
 		# pending kernel applies before reboot
 		if output_cmd opnsense-update -K -c; then
 			output_cmd opnsense-update -K
 		fi
-		output_restart_action keep-log
+		output_restart_action keep-log ${PREFER_SHUTDOWN}
 	fi
 
 	output_txt "The upgrade was aborted due to an error."