diff options
| author | jim-p <jimp@pfsense.org> | 2012-06-24 15:59:33 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-06-24 15:59:33 -0400 |
| commit | a2beee7597b1ed52961e218deba18caa278337ab (patch) | |
| tree | fbecb01adb8daf95d4b67bbd508640557c4d7503 /etc/inc/util.inc | |
| parent | 58816510ae391de12e16a72e803336cfeb37c747 (diff) | |
| download | pfsense-a2beee7597b1ed52961e218deba18caa278337ab.zip pfsense-a2beee7597b1ed52961e218deba18caa278337ab.tar.gz | |
Catch libraries from subdirectories of PBI lib dirs too
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 9d234a8..ccd8e58 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1817,7 +1817,7 @@ function array_exclude($needle, $haystack) { function setup_library_paths() { $current_library_paths = explode(":", exec("/sbin/ldconfig -r | /usr/bin/grep 'search directories' | /usr/bin/awk '{print $3;}'")); - $pbi_library_paths = glob("/usr/pbi/*/lib"); + $pbi_library_paths = array_merge(glob("/usr/pbi/*/lib", GLOB_ONLYDIR), glob("/usr/pbi/*/lib/*", GLOB_ONLYDIR)); foreach ($pbi_library_paths as $pbilib) { if (!in_array($pbilib, $current_library_paths)) exec("/sbin/ldconfig -m {$pbilib}"); |
