mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

After an interface mismatch and apply actually show when we are rebooting instead of the same message that the interface mismatch exists when really the system is rebooting.

Browse Source
This commit is contained in:
Scott Ullrich 2011-06-23 14:08:38 -04:00
parent d2a08a06eb
commit ca4acbcdd8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr/local/www/interfaces_assign.php
View File

@ -154,9 +154,10 @@ if (is_array($config['openvpn'])) {
}
if ($_POST['apply']) {
if (file_exists("/var/run/interface_mismatch_reboot_needed"))
if (file_exists("/var/run/interface_mismatch_reboot_needed")) {
system_reboot();
else {
$rebootingnow = true;
} else {
write_config();
$retval = 0;
@ -370,11 +371,14 @@ if ($_GET['act'] == "add" && (count($config['interfaces']) < count($portlist)))
include("head.inc");
if(file_exists("/var/run/interface_mismatch_reboot_needed"))
if ($_POST)
$savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot.");
else
if ($_POST) {
if($rebootingnow)
$savemsg = gettext("The system is now rebooting. Please wait.");
else
$savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot.");
} else {
$savemsg = gettext("Interface mismatch detected. Please resolve the mismatch and click Save. The firewall will reboot afterwards.");
}
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">