diff --git a/etc/rc.bootup b/etc/rc.bootup index ab4a5b54a1..3451c88d4a 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -385,9 +385,9 @@ if(file_exists('/conf/needs_package_sync')) { if($config['installedpackages'] <> '' && is_array($config['installedpackages']['package'])) { require_once("pkg-utils.inc"); if($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") { - mark_subsystem_dirty('firmwarelock'); + mark_subsystem_dirty('packagelock'); pkg_reinstall_all(); - clear_subsystem_dirty('firmwarelock'); + clear_subsystem_dirty('packagelock'); } } } diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index b290899b0a..6efb7a6450 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -425,5 +425,10 @@ function add_to_menu($url, $name) {
Do not make changes in the GUI until this is complete.") . "

"); +} $pgtitle_output = true; ?> diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 3c1ba8973f..15097a647d 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -44,6 +44,19 @@ require_once("globals.inc"); require_once("guiconfig.inc"); require_once("pkg-utils.inc"); +/* if upgrade in progress, alert user */ +if(is_subsystem_dirty('packagelock')) { + $pgtitle = array(gettext("System"),gettext("Package Manager")); + include("head.inc"); + echo "\n"; + include("fbegin.inc"); + echo "Please wait while packages are reinstalled in the background."; + include("fend.inc"); + echo ""; + echo ""; + exit; +} + $pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "supportedbybsdperimeter")); if($pkg_info) { $fout = fopen("{$g['tmp_path']}/pkg_info.cache", "w"); diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 48c9677bb1..02fb8d3a89 100755 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -40,6 +40,19 @@ require_once("guiconfig.inc"); require_once("pkg-utils.inc"); +/* if upgrade in progress, alert user */ +if(is_subsystem_dirty('packagelock')) { + $pgtitle = array(gettext("System"),gettext("Package Manager")); + include("head.inc"); + echo "\n"; + include("fbegin.inc"); + echo "Please wait while packages are reinstalled in the background."; + include("fend.inc"); + echo ""; + echo ""; + exit; +} + if(is_array($config['installedpackages']['package'])) { foreach($config['installedpackages']['package'] as $instpkg) { $tocheck[] = $instpkg['name'];