Project

General

Profile

« Previous | Next » 

Revision 261c7de8

Added by Jim Pingle over 14 years ago

Warn users a different way if packages are being reinstalled in the background. Only lock out package pages, still print a giant warning on the others. (Some people were getting stuck in this state http://forum.pfsense.org/index.php/topic,32531.0.html )

View differences:

etc/rc.bootup
385 385
	if($config['installedpackages'] <> '' && is_array($config['installedpackages']['package'])) {
386 386
		require_once("pkg-utils.inc");
387 387
		if($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
388
			mark_subsystem_dirty('firmwarelock');
388
			mark_subsystem_dirty('packagelock');
389 389
			pkg_reinstall_all();
390
			clear_subsystem_dirty('firmwarelock');
390
			clear_subsystem_dirty('packagelock');
391 391
		}
392 392
	}
393 393
}
usr/local/www/fbegin.inc
425 425
<br />
426 426

  
427 427
<?php
428
/* if upgrade in progress, alert user */
429
if(is_subsystem_dirty('packagelock')) {
430
	$pgtitle = array(gettext("System"),gettext("Package Manager"));
431
	print_info_box(gettext("Packages are currently being reinstalled in the background.<p>Do not make changes in the GUI until this is complete.") . "<p><img src='/themes/{$g['theme']}/images/icons/icon_fw-update.gif'>");
432
}
428 433
	$pgtitle_output = true;
429 434
?>
usr/local/www/pkg_mgr.php
44 44
require_once("guiconfig.inc");
45 45
require_once("pkg-utils.inc");
46 46

  
47
/* if upgrade in progress, alert user */
48
if(is_subsystem_dirty('packagelock')) {
49
	$pgtitle = array(gettext("System"),gettext("Package Manager"));
50
	include("head.inc");
51
	echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n";
52
	include("fbegin.inc");
53
	echo "Please wait while packages are reinstalled in the background.";
54
	include("fend.inc");
55
	echo "</body>";
56
	echo "</html>";
57
	exit;
58
}
59

  
47 60
$pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "supportedbybsdperimeter"));
48 61
if($pkg_info) {
49 62
	$fout = fopen("{$g['tmp_path']}/pkg_info.cache", "w");
usr/local/www/pkg_mgr_installed.php
40 40
require_once("guiconfig.inc");
41 41
require_once("pkg-utils.inc");
42 42

  
43
/* if upgrade in progress, alert user */
44
if(is_subsystem_dirty('packagelock')) {
45
	$pgtitle = array(gettext("System"),gettext("Package Manager"));
46
	include("head.inc");
47
	echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n";
48
	include("fbegin.inc");
49
	echo "Please wait while packages are reinstalled in the background.";
50
	include("fend.inc");
51
	echo "</body>";
52
	echo "</html>";
53
	exit;
54
}
55

  
43 56
if(is_array($config['installedpackages']['package'])) {
44 57
	foreach($config['installedpackages']['package'] as $instpkg) {
45 58
		$tocheck[] = $instpkg['name'];

Also available in: Unified diff