lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/opnsense/core

Browse Source
This commit is contained in:
Ad Schellevis 2014-12-26 11:49:35 +00:00
commit 11f565212c
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -7,8 +7,10 @@ umount:
umount -f "<above>:${.CURDIR}/src"
install:
mkdir -p ${DESTDIR}/usr/local
cp -r ${.CURDIR}/src/* ${DESTDIR}/usr/local
@mkdir -p ${DESTDIR}/usr/local
@cp -r ${.CURDIR}/src/* ${DESTDIR}/usr/local
@(cd ${.CURDIR}/src; find * -type f) | \
xargs -n1 printf "/usr/local/%s\n"
lint:
find ${.CURDIR}/src -name "*.class" -print0 | xargs -0 -n1 php -l

18
src/opnsense/scripts/pkg_upgrade.sh
View File

@ -1,5 +1,17 @@
#!/bin/sh
pkg upgrade -y > /tmp/pkg_upgrade.progress &
echo '***DONE***' >> /tmp/pkg_upgrade.progress
rm /tmp/pkg_upgrade.progress
pkg_running=`ps -x | grep "pkg " | grep -v "grep"`
if [ "$pkg_running" == "" ]; then
if [ -f /tmp/pkg_upgrade.progress ]; then
# Remove leftovers from previous upgrade first
rm /tmp/pkg_upgrade.progress
fi
# start pkg upgrade
pkg upgrade -y > /tmp/pkg_upgrade.progress
echo '***DONE***' >> /tmp/pkg_upgrade.progress
else
echo 'Upgrade already in progress'
echo '***DONE***'
fi

2
src/www/system_firmware_check.php
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' ) {