* global the $noreboot variable

* do not tell the user the firewall will reboot if $noreboot is set.

2 files changed, 8 insertions, 3 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index ce4a617..f34799b 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -553,6 +553,8 @@ function config_unlock() {
 }
 
 function set_networking_interfaces_ports() {
+	global $noreboot;
+
 	$fp = fopen('php://stdin', 'r');
 
 	$iflist = get_interface_list();
@@ -694,9 +696,9 @@ EOD;
 		echo "OPT" . ($i+1) . " -> " . $optif[$i] . "\n";
 	}
 
-echo <<<EOD
+	if(!$noreboot) echo "\npfSense will reboot after saving the changes.\n";
 
-pfSense will reboot after saving the changes.
+echo <<<EOD
 
 Do you want to proceed [y|n]?
 EOD;
@@ -743,9 +745,11 @@ EOD;
 
 		write_config();
 
+		if(!$noreboot) echo "\npfSense is now rebooting.\n";
+
 		echo <<<EOD
 
-pfSense is rebooting now.
+
 
 EOD;
 
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 9285d0e..9df3f0b 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -50,6 +50,7 @@
 
 	if($do_assign == 1) {
 		$noreboot = true;
+		echo "\n\n\nInterface mistmatch.  Running Interface assignment option.\n";
 		set_networking_interfaces_ports();
 	}