Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/interfaces.inc
	etc/inc/system.inc

1 files changed, 7 insertions, 0 deletions

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 410fb0b..6ff65fe 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -451,6 +451,13 @@ if ($_POST) {
 									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.");
 							}