Style clieanup.

6 files changed, 40 insertions, 40 deletions

diff --git a/etc/rc.initial.defaults b/etc/rc.initial.defaults
index 8e33fd2..0667bfd 100755
--- a/etc/rc.initial.defaults
+++ b/etc/rc.initial.defaults
@@ -3,20 +3,20 @@
 /*
 	rc.initial.defaults
 	part of m0n0wall (http://m0n0.ch/wall)
-	
+
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
-	
+
 	1. Redistributions of source code must retain the above copyright notice,
 	   this list of conditions and the following disclaimer.
-	
+
 	2. Redistributions in binary form must reproduce the above copyright
 	   notice, this list of conditions and the following disclaimer in the
 	   documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -35,27 +35,27 @@
 	/* parse the configuration and include all functions used below */
 	require_once("config.inc");
 	require_once("functions.inc");
-	
+
 	$fp = fopen('php://stdin', 'r');
-	
+
 	echo <<<EOD
-	
+
 You are about to reset the firewall to factory defaults.
 The firewall will reboot after resetting the configuration.
 
-Do you want to proceed? (y/n) 
+Do you want to proceed [y|n]?
 EOD;
 
 	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
-		
+
 		reset_factory_defaults();
-		
+
 		echo <<<EOD
 
-The firewall is rebooting now.
+pfSense is rebooting now.
 
 EOD;
-	
+
 		system_reboot_sync();
 	}
 ?>
diff --git a/etc/rc.initial.halt b/etc/rc.initial.halt
index 7757399..d490b29 100755
--- a/etc/rc.initial.halt
+++ b/etc/rc.initial.halt
@@ -41,7 +41,7 @@
 
 pfSense will shutdown and halt system. This may take one minute.
 
-Do you want to proceed? (y/n)
+Do you want to proceed [y|n]? 
 EOD;
 
 	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
diff --git a/etc/rc.initial.password b/etc/rc.initial.password
index 59d5d58..3815437 100755
--- a/etc/rc.initial.password
+++ b/etc/rc.initial.password
@@ -39,7 +39,7 @@
 
 The webGUI password will be reset to the default (which is 'pfsense').
 
-Do you want to proceed (y/n) ?
+Do you want to proceed [y|n]? 
 EOD;
 
 	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
diff --git a/etc/rc.initial.reboot b/etc/rc.initial.reboot
index d750ee7..e56fda2 100755
--- a/etc/rc.initial.reboot
+++ b/etc/rc.initial.reboot
@@ -39,7 +39,7 @@
 
 pfSense will reboot. This may take one minute.
 
-Do you want to proceed? (y/n)
+Do you want to proceed [y|n]? 
 EOD;
 
 	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index 99fd922..c75b9f2 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -3,20 +3,20 @@
 /*
 	rc.initial.setlanip
 	part of m0n0wall (http://m0n0.ch/wall)
-	
+
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
-	
+
 	1. Redistributions of source code must retain the above copyright notice,
 	   this list of conditions and the following disclaimer.
-	
+
 	2. Redistributions in binary form must reproduce the above copyright
 	   notice, this list of conditions and the following disclaimer in the
 	   documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -32,9 +32,9 @@
 	/* parse the configuration and include all functions used below */
 	require_once("config.inc");
 	require_once("functions.inc");
-	
+
 	$fp = fopen('php://stdin', 'r');
-	
+
 	do {
 		echo "\nEnter the new LAN IP address: ";
 		$lanip = chop(fgets($fp));
@@ -47,7 +47,7 @@
 	echo "e.g. 255.255.255.0 = 24\n";
 	echo "     255.255.0.0   = 16\n";
 	echo "     255.0.0.0     = 8\n\n";
-	
+
 	do {
 		echo "Enter the new LAN subnet bit count: ";
 		$lanbits = chop(fgets($fp));
@@ -55,12 +55,12 @@
 			exit(0);
 		}
 	} while (!is_numeric($lanbits) || ($lanbits < 1) || ($lanbits > 31));
-	
+
 	$config['interfaces']['lan']['ipaddr'] = $lanip;
 	$config['interfaces']['lan']['subnet'] = $lanbits;
-	
-	echo "\nDo you want to enable the DHCP server on LAN? (y/n) ";
-	
+
+	echo "\nDo you want to enable the DHCP server on LAN [y|n]?  ";
+
 	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
 		do {
 			echo "Enter the start address of the client address range: ";
@@ -69,7 +69,7 @@
 				exit(0);
 			}
 		} while (!is_ipaddr($dhcpstartip));
-		
+
 		do {
 			echo "Enter the end address of the client address range: ";
 			$dhcpendip = chop(fgets($fp));
@@ -77,32 +77,32 @@
 				exit(0);
 			}
 		} while (!is_ipaddr($dhcpendip));
-		
+
 		$config['dhcpd']['lan']['enable'] = true;
 		$config['dhcpd']['lan']['range']['from'] = $dhcpstartip;
 		$config['dhcpd']['lan']['range']['to'] = $dhcpendip;
 	} else {
 		unset($config['dhcpd']['lan']['enable']);
 	}
-	
+
 	if ($config['system']['webgui']['protocol'] == "https") {
-	
+
 		echo "\nDo you want to revert to HTTP as the webGUI protocol? (y/n) ";
-		
+
 		if (strcasecmp(chop(fgets($fp)), "y") == 0)
 			$config['system']['webgui']['protocol'] = "http";
 	}
-	
+
 	if (isset($config['system']['webgui']['noantilockout'])) {
 		echo "\nNote: the anti-lockout rule on LAN has been re-enabled.\n";
 		unset($config['system']['webgui']['noantilockout']);
 	}
-	
+
 	write_config();
 	interfaces_lan_configure();
-	
+
 	echo <<<EOD
-	
+
 The LAN IP address has been set to $lanip/$lanbits.
 You can now access the webGUI by opening the following URL
 in your browser:
diff --git a/etc/rc.initial.setports b/etc/rc.initial.setports
index 205c5b0..4601631 100755
--- a/etc/rc.initial.setports
+++ b/etc/rc.initial.setports
@@ -55,7 +55,7 @@ Do you want to set up VLANs first?
 If you're not going to use VLANs, or only for optional interfaces, you
 should say no here and use the webGUI to configure VLANs later, if required.
 
-Do you want to set up VLANs now? (y/n)
+Do you want to set up VLANs now [y|n]?
 EOD;
 
 	if (strcasecmp(chop(fgets($fp)), "y") == 0)
@@ -178,7 +178,7 @@ echo <<<EOD
 
 pfSense will reboot after saving the changes.
 
-Do you want to proceed? (y/n)
+Do you want to proceed [y|n]?
 EOD;
 
 	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
@@ -264,7 +264,7 @@ EOD;
 
 WARNING: all existing VLANs will be cleared if you proceed!
 
-Do you want to proceed? (y/n)
+Do you want to proceed [y|n]? 
 EOD;
 
 		if (strcasecmp(chop(fgets($fp)), "y") != 0)