summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-06-18 21:05:36 +0000
committerErmal <eri@pfsense.org>2010-06-18 21:05:36 +0000
commit3a9eb3c90848a78bbd5ae2c6285343e338bc6bb3 (patch)
tree9ece14d991d991f4c333e688eefead6da220955d
parentfb0f242b1e33023aef42e48b5749e72634c32d06 (diff)
downloadpfsense-3a9eb3c90848a78bbd5ae2c6285343e338bc6bb3.zip
pfsense-3a9eb3c90848a78bbd5ae2c6285343e338bc6bb3.tar.gz
If packages are reinstalled during bootup than there is no need to reinstall them again during GUI login.
-rw-r--r--etc/inc/pkg-utils.inc7
-rwxr-xr-xusr/local/www/index.php3
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 6c241c2..6015f72 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -172,8 +172,10 @@ function resync_all_package_configs($show_message = false) {
global $config, $restart_sync, $pkg_interface;
$i = 0;
log_error("Resyncing configuration for all packages.");
- if(!$config['installedpackages']['package']) return;
- if($show_message == true) print "Syncing packages:";
+ if(!$config['installedpackages']['package'])
+ return;
+ if($show_message == true)
+ echo "Syncing packages:";
foreach($config['installedpackages']['package'] as $package) {
if (empty($package['name']))
continue;
@@ -189,6 +191,7 @@ function resync_all_package_configs($show_message = false) {
$i++;
}
if($show_message == true) print ".\n";
+ @unlink("/conf/needs_package_sync");
}
/*
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 68755f9..e5c5d60 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -108,9 +108,6 @@ if (!is_array($config['widgets'])) {
## 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($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
header('Location: pkg_mgr_install.php?mode=reinstallall');
exit;
OpenPOWER on IntegriCloud