From feb9e72289ddea4e2cc34deeb1a82bae0a598300 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 8 Jul 2015 22:22:45 +0200 Subject: [PATCH] backup: do not redirect on interface mismatches 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 --- src/www/diag_backup.php | 14 -------------- src/www/interfaces_assign.php | 27 +++++++-------------------- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php index e4a225ca6..809af187c 100644 --- a/src/www/diag_backup.php +++ b/src/www/diag_backup.php @@ -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."); } diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php index 8123d5402..9845d8c02 100644 --- a/src/www/interfaces_assign.php +++ b/src/www/interfaces_assign.php @@ -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."); - } ?>