lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

backup: do not redirect on interface mismatches

Browse Source 
The default is to reboot anyway.  For everybody importing a backup
that has interface mismatches this means the backup did not come
from the same system, so it must be adapted on the console instead.

Caused by:	Omitted /var/run boot up purge
This commit is contained in:
Franco Fichtner 2015-07-08 22:22:45 +02:00
parent de8d93960d
commit feb9e72289
2 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/www/diag_backup.php
View File

@ -442,20 +442,6 @@ if ($_POST) {
}
}
setup_serial_port();
if(is_interface_mismatch() == true) {
touch("/var/run/interface_mismatch_reboot_needed");
clear_subsystem_dirty("restore");
convert_config();
header("Location: interfaces_assign.php");
exit;
}
if (is_interface_vlan_mismatch() == true) {
touch("/var/run/interface_mismatch_reboot_needed");
clear_subsystem_dirty("restore");
convert_config();
header("Location: interfaces_assign.php");
exit;
}
} else {
$input_errors[] = gettext("The configuration could not be restored.");
}

27
src/www/interfaces_assign.php
View File

@ -221,19 +221,15 @@ if (isset($_POST['add_x']) && isset($_POST['if_add'])) {
}
} else if (isset($_POST['apply'])) {
if (file_exists("/var/run/interface_mismatch_reboot_needed")) {
system_reboot();
$rebootingnow = true;
} else {
write_config();
write_config();
$retval = filter_configure();
$retval = filter_configure();
$savemsg = get_std_save_message($retval);
if (stristr($retval, "error") != true) {
$savemsg = get_std_save_message($retval);
if (stristr($retval, "error") <> true)
$savemsg = get_std_save_message($retval);
else
$savemsg = $retval;
} else {
$savemsg = $retval;
}
} else if (isset($_POST['Submit'])) {
@ -418,15 +414,6 @@ foreach ($portlist as $portname => $portinfo) {
include("head.inc");
if(file_exists("/var/run/interface_mismatch_reboot_needed"))
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 'Apply changes'. The firewall will reboot afterwards.");
}
?>
<body>