diff options
| -rw-r--r-- | etc/inc/pkg-utils.inc | 3 | ||||
| -rwxr-xr-x | usr/local/www/index.php | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 4a498d7..f9af6a6 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -541,7 +541,8 @@ function install_package($package, $pkg_info = "") { $changedesc = "Overwrote previous installation of {$pkg_info['name']}."; $to_output = "overwrite!\n"; } - /* XXX: Fix inclusion of config.inc that causes data loss! */ + if(file_exists('/conf/needs_package_sync')) + @unlink('/conf/needs_package_sync'); conf_mount_ro(); write_config(); $static_output .= $to_output; diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 7ee87cb..7c577bc 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -112,7 +112,6 @@ if (!is_array($config['widgets'])) { 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'); |
