summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorColin Smith <colin@pfsense.org>2005-03-16 01:47:31 +0000
committerColin Smith <colin@pfsense.org>2005-03-16 01:47:31 +0000
commit45cb953d7932688786cbeffe5b1686fdb976c9a6 (patch)
tree9af5cd2925d784bd6eca19b117a77c4ad34496d4 /etc
parent2507bf87c3eca605a9d402e0d3256d5bece54002 (diff)
downloadpfsense-45cb953d7932688786cbeffe5b1686fdb976c9a6.zip
pfsense-45cb953d7932688786cbeffe5b1686fdb976c9a6.tar.gz
Make is_package_installed() work for other packages again ;)
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.inc3
-rw-r--r--etc/inc/pfsense-utils.inc2
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 6d00b60..5ac1d39 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -447,6 +447,9 @@ function convert_config() {
$config['version'] = "1.5";
}
+ /* Convert 1.5 -> 1.6 */
+
+
write_config();
if ($g['booting'])
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 142f236..85a29ea 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -344,7 +344,7 @@ function remove_text_from_file($file, $text) {
function is_package_installed($packagename) {
global $config;
foreach ($config['installedpackages']['package'] as $pkg) {
- if($pkg['name'] == "squid") return 1;
+ if($pkg['name'] == $packagename) return 1;
}
return 0;
}
OpenPOWER on IntegriCloud