summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsullrich <sullrich@pfsense.org>2009-11-29 18:33:24 -0500
committersullrich <sullrich@pfsense.org>2009-11-29 18:33:24 -0500
commit07b1797b458d6d3d8033ce135c7a2c990a67ab65 (patch)
treeb993b4fa26dcf24af99162d236fca318b320cf69
parentc0c7eb483b88042ddd61968afdda39651362be88 (diff)
downloadpfsense-07b1797b458d6d3d8033ce135c7a2c990a67ab65.zip
pfsense-07b1797b458d6d3d8033ce135c7a2c990a67ab65.tar.gz
Define full path to binaries
-rwxr-xr-xetc/rc.php_ini_setup4
-rwxr-xr-xusr/local/www/diag_backup.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index ac4d8db..06686d8 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -31,9 +31,9 @@ EXTENSIONSDIR="/usr/local/lib/php/20060613/"
# Grab amount of memory that is deteceted
if [ -f /var/log/dmesg.boot ]; then
- AVAILMEM=`cat /var/log/dmesg.boot | grep "memory" | grep "avail" | awk '{ print $5 }' | cut -d'(' -f2 | cut -d'M' -f1`
+ AVAILMEM=`/bin/cat /var/log/dmesg.boot | /usr/bin/grep "memory" | /usr/bin/grep "avail" | /usr/bin/awk '{ print $5 }' | /usr/bin/cut -d'(' -f2 | /usr/bin/cut -d'M' -f1`
else
- AVAILMEM=`dmesg -a | grep "memory" | grep "avail" | awk '{ print $5 }' | cut -d'(' -f2 | cut -d'M' -f1`
+ AVAILMEM=`/sbin/dmesg -a | /usr/bin/grep "memory" | /usr/bin/grep "avail" | /usr/bin/awk '{ print $5 }' | /usr/bin/cut -d'(' -f2 | /usr/bin/cut -d'M' -f1`
fi
# Calculate APC SHM size according
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index faaec00..6e21c69 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -177,7 +177,7 @@ if ($_POST) {
if (!$input_errors) {
- $lockbckp = lock('config');
+ //$lockbckp = lock('config');
$host = "{$config['system']['hostname']}.{$config['system']['domain']}";
$name = "config-{$host}-".date("YmdHis").".xml";
@@ -207,7 +207,7 @@ if ($_POST) {
}
}
- unlock($lockbckp);
+ //unlock($lockbckp);
if ($_POST['encrypt']) {
$data = encrypt_data($data, $_POST['encrypt_password']);
OpenPOWER on IntegriCloud