summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErik Fonnesbeck <efonnes@gmail.com>2010-12-30 10:30:43 -0700
committerErik Fonnesbeck <efonnes@gmail.com>2010-12-30 11:47:43 -0700
commitf9626e574bc2d69beb866e478c2b1d37e9e24660 (patch)
treed8e4931e1f3f58f8c55fd7a154c100ab31b210fb /usr
parent9b1939e130c6555c1ad895a9d0136b738453b18e (diff)
downloadpfsense-f9626e574bc2d69beb866e478c2b1d37e9e24660.zip
pfsense-f9626e574bc2d69beb866e478c2b1d37e9e24660.tar.gz
Only unlink /conf/needs_package_sync if no packages are installed, otherwise leave it to the package manager to take care of it.
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/index.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 7ee87cb..c1fdc26 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -110,14 +110,15 @@ if (!is_array($config['widgets'])) {
## User recently restored his config.
## If packages are installed lets resync
if(file_exists('/conf/needs_package_sync')) {
- if($config['installedpackages'] <> '') {
- conf_mount_rw();
- @unlink('/conf/needs_package_sync');
- conf_mount_ro();
+ if($config['installedpackages'] <> '' && is_array($config['installedpackages']['package'])) {
if($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
header('Location: pkg_mgr_install.php?mode=reinstallall');
exit;
}
+ } else {
+ conf_mount_rw();
+ @unlink('/conf/needs_package_sync');
+ conf_mount_ro();
}
}
OpenPOWER on IntegriCloud