Firmware upgrade is now fully functional

This commit is contained in:
Charlie Root 2014-12-23 11:37:27 +00:00
parent 814ee48878
commit a2e63b70aa
2 changed files with 3 additions and 3 deletions

View File

@ -2,12 +2,12 @@
pkg_running=`ps -x | grep "pkg " | grep -v "grep"`
if [ "$pkg_running" == "" ]; then
if [ -f /tmp/pkg_upgrade.progress ]
if [ -f /tmp/pkg_upgrade.progress ]; then
# Remove leftovers from previous upgrade first
rm /tmp/pkg_upgrade.progress
fi
# start pkg upgrade
pkg upgrade -n > /tmp/pkg_upgrade.progress & # Need to st this to -y for production, now set to -n for testing purpose
pkg upgrade -y > /tmp/pkg_upgrade.progress &
echo '***DONE***' >> /tmp/pkg_upgrade.progress
else
echo 'Upgrade already in progress'

View File

@ -52,7 +52,7 @@ if($_POST['action'] == 'pkg_upgrade') {
$shell_output = array();
$shell = new Core\Shell();
// execute shell command and collect (only valid) info into named array
$shell->exec("/usr/local/opnsense/scripts/pkg_upgrade.sh &",false,false,$shell_output);
$shell->exec("/usr/local/opnsense/scripts/pkg_upgrade.sh",false,false,$shell_output);
}
if($_POST['action'] == 'update_status' ) {