From 753bb32ea3d6d879da80c5e78581ff3d08274574 Mon Sep 17 00:00:00 2001 From: Jos Schellevis Date: Mon, 29 Dec 2014 15:31:31 +0000 Subject: [PATCH] And more upgrade stuff... --- src/opnsense/scripts/pkg_upgrade.sh | 3 ++- src/www/system_firmware_check.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/opnsense/scripts/pkg_upgrade.sh b/src/opnsense/scripts/pkg_upgrade.sh index c5323b3d2..6cdaa343a 100755 --- a/src/opnsense/scripts/pkg_upgrade.sh +++ b/src/opnsense/scripts/pkg_upgrade.sh @@ -31,7 +31,8 @@ if [ "$pkg_running" == "" ]; then rm /tmp/pkg_upgrade.progress fi # start pkg upgrade - pkg upgrade -y > /tmp/pkg_upgrade.progress + echo '***STARTING UPGRADE***' > /tmp/pkg_upgrade.progress + pkg upgrade -y >> /tmp/pkg_upgrade.progress echo '***DONE***' >> /tmp/pkg_upgrade.progress else echo 'Upgrade already in progress' diff --git a/src/www/system_firmware_check.php b/src/www/system_firmware_check.php index c1fc1deae..3918c0a7e 100644 --- a/src/www/system_firmware_check.php +++ b/src/www/system_firmware_check.php @@ -50,7 +50,7 @@ if($_POST['action'] == 'pkg_update') { if($_POST['action'] == 'pkg_upgrade') { /* Setup Shell variables */ $shell_output = array(); - $shell = new OPsense\Core\Shell(); + $shell = new OPNsense\Core\Shell(); // execute shell command and collect (only valid) info into named array $shell->exec("/usr/local/opnsense/scripts/pkg_upgrade.sh > /dev/null 2 > /dev/null < /dev/null &",false,false,$shell_output); }