diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-12-23 00:47:25 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-12-23 00:47:25 +0000 |
| commit | 69b27c16e5abf4d3bb1fa478bc615162e2e7ea3f (patch) | |
| tree | b8a8f76917a0606ccc44e4d068b646d40b9031ca /etc | |
| parent | c52f3ce39e177a69b4a3f929d62384cf4104dd52 (diff) | |
| download | pfsense-69b27c16e5abf4d3bb1fa478bc615162e2e7ea3f.zip pfsense-69b27c16e5abf4d3bb1fa478bc615162e2e7ea3f.tar.gz | |
Test modules correctly
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.php_ini_setup | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup index a01fb27..b1232e6 100755 --- a/etc/rc.php_ini_setup +++ b/etc/rc.php_ini_setup @@ -69,7 +69,13 @@ PHPMODULES="apc \ zlib" # Get a loaded module list in the stock php -LOADED_MODULES=`php -m | grep -v "\[" | grep "[a-z][A-Z]"` +if [ -f /usr/local/etc/php.ini ]; then + rm /usr/local/etc/php.ini +fi +if [ -f /usr/local/lib/php.ini ]; then + rm /usr/local/lib/php.ini +fi +LOADED_MODULES=`php -m | grep -v "\["` # Populate a dummy php.ini to avoid # the file being clobbered and the firewall @@ -109,7 +115,7 @@ for EXT in $PHPMODULES; do done if [ "$SHOULDADD" = "true" ]; then # Ensure extension exists before adding. - if [ -f "${EXTENSIONSDIR}/${EXT}.so" ]; then + if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then echo "extension=${EXT}.so" >> /usr/local/lib/php.ini fi fi |
