From bfaca65530f9ff9eb82279cc497ee2552f48161e Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 20 Jan 2009 14:53:49 -0500
Subject: [PATCH] Use $g['product_name'] instead of pfSense

---
 etc/rc.banner                                   |  3 ++-
 etc/rc.bootup                                   |  2 +-
 etc/rc.initial                                  | 10 ++++++----
 etc/rc.initial.defaults                         |  2 +-
 etc/rc.initial.halt                             |  4 ++--
 etc/rc.initial.reboot                           |  4 ++--
 etc/rc.initial.setlanip                         |  2 +-
 etc/rc.initial.store_config_to_removable_device |  2 +-
 etc/rc.newwanip                                 |  2 +-
 etc/rc.shutdown                                 |  6 ++++--
 10 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/etc/rc.banner b/etc/rc.banner
index a11208a0ac..86f34b77cd 100755
--- a/etc/rc.banner
+++ b/etc/rc.banner
@@ -37,8 +37,9 @@
 	$version = trim(file_get_contents("{$g['etc_path']}/version"));
 	$platform = trim(file_get_contents("{$g['etc_path']}/platform"));
 	$hostname = $config['system']['hostname'];
+	$product  = $g['product_name'];
 
-	print "\n*** Welcome to pfSense {$version}-{$platform} on {$hostname} ***\n";
+	print "\n*** Welcome to {$g['product_name]} {$version}-{$platform} on {$hostname} ***\n";
 
 	/* get our initial interface list */
 	$vfaces = array(
diff --git a/etc/rc.bootup b/etc/rc.bootup
index a4fbba0c50..a296c06a0f 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -303,7 +303,7 @@
 
 	if($avail < 126) {
 		require_once("/etc/inc/notices.inc");
-		file_notice("pfSenseMemoryRequirements", "pfSense requires atleast 128 megabytes of RAM.  Expect unusual performance.  This platform is not supported.", "Memory", "", 1);
+		file_notice("{$g['product_name]}MemoryRequirements", "{$g['product_name]} requires atleast 128 megabytes of RAM.  Expect unusual performance.  This platform is not supported.", "Memory", "", 1);
 		mwexec("sysctl net.inet.tcp.recvspace=4096");
 		mwexec("sysctl net.inet.tcp.sendspace=4096");
 	}
diff --git a/etc/rc.initial b/etc/rc.initial
index 8172e2d077..2852c9281b 100755
--- a/etc/rc.initial
+++ b/etc/rc.initial
@@ -8,11 +8,13 @@
 # Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 # All rights reserved.
 
+product=`cat /etc/inc/globals.inc | grep product_name | cut -d'"' -f4`
+
 if [ -e /usr/local/etc/rc.d/dev_bootstrap.sh ]; then
 	echo
 	echo "A developer bootstrap is most likely in progress."
 	echo "This operation bootstraps all developer files from"
-	echo "pfSense.com and also FreeBSD.org and builds a ISO"
+	echo "$product and also FreeBSD.org and builds a ISO"
 	echo "to verify the environment is sane."
 	echo
 	echo "During this process, /usr/src is automatically downloaded"
@@ -62,7 +64,7 @@ fi
 # display a cheap menu
 echo
 echo
-echo " pfSense console setup "
+echo " ${product} console setup "
 echo "***********************"
 echo " 0)  Logout (SSH only)"
 echo " 1)  Assign Interfaces"
@@ -76,7 +78,7 @@ echo " 8)  Shell"
 echo " 9)  PFtop"
 echo "10)  Filter Logs"
 echo "11)  Restart webConfigurator"
-echo "12)  pfSense PHP shell"
+echo "12)  ${product} PHP shell"
 echo "13)  Upgrade from console"
 SSHD=`netstat -an | grep "*.22" | wc -l`
 if [ "$SSHD" -gt 0 ]; then
@@ -93,7 +95,7 @@ for i in /var/db/pfi/capable_*; do
 done
 
 if [ "$PLATFORM" = "cdrom" ]; then
-    echo "99)  Install pfSense to a hard drive/memory drive, etc."
+    echo "99)  Install ${product} to a hard drive/memory drive, etc."
     echo
 fi
 
diff --git a/etc/rc.initial.defaults b/etc/rc.initial.defaults
index 97b03ebd07..1f948565c5 100755
--- a/etc/rc.initial.defaults
+++ b/etc/rc.initial.defaults
@@ -53,7 +53,7 @@ EOD;
 
 		echo <<<EOD
 
-pfSense is rebooting now.
+{$g['product_name']} is rebooting now.
 
 EOD;
 
diff --git a/etc/rc.initial.halt b/etc/rc.initial.halt
index 1d1a7845bf..82d615e1c2 100755
--- a/etc/rc.initial.halt
+++ b/etc/rc.initial.halt
@@ -40,7 +40,7 @@
 
 	echo <<<EOD
 
-pfSense will shutdown and halt system. This may take one minute.
+{$g['product_name']} will shutdown and halt system. This may take one minute.
 
 Do you want to proceed [y|n]? 
 EOD;
@@ -49,7 +49,7 @@ EOD;
 
 		echo <<<EOD
 
-pfSense will shutdown and halt system  now.
+{$g['product_name']} will shutdown and halt system  now.
 
 EOD;
 
diff --git a/etc/rc.initial.reboot b/etc/rc.initial.reboot
index aeed301a4c..dc666b92c3 100755
--- a/etc/rc.initial.reboot
+++ b/etc/rc.initial.reboot
@@ -38,7 +38,7 @@
 
 	echo <<<EOD
 
-pfSense will reboot. This may take one minute.
+{$g['product_name']} will reboot. This may take one minute.
 
 Do you want to proceed [y|n]? 
 EOD;
@@ -47,7 +47,7 @@ EOD;
 
 		echo <<<EOD
 
-pfSense is rebooting now.
+{$g['product_name']} is rebooting now.
 
 EOD;
 
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index e2f7aadb62..43ed64ce06 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -45,7 +45,7 @@
 		}
 	} while (!is_ipaddr($lanip));
 
-	echo "\nSubnet masks are entered as bit counts (as in CIDR notation) in pfSense.\n";
+	echo "\nSubnet masks are entered as bit counts (as in CIDR notation) in {$g['product_name']}.\n";
 	echo "e.g. 255.255.255.0 = 24\n";
 	echo "     255.255.0.0   = 16\n";
 	echo "     255.0.0.0     = 8\n\n";
diff --git a/etc/rc.initial.store_config_to_removable_device b/etc/rc.initial.store_config_to_removable_device
index 9138bbee3b..d729f0c75e 100755
--- a/etc/rc.initial.store_config_to_removable_device
+++ b/etc/rc.initial.store_config_to_removable_device
@@ -51,7 +51,7 @@
 		echo "\n\n";
 		echo "Enter the device that you wish the";
 		echo "\n";
-		echo "pfSense configuration file to reside on: ";
+		echo "{$g['product_name']} configuration file to reside on: ";
 		$move_config_to_device = chop(fgets($fp));
 		if ($move_config_to_device == "") {
 			exit(0);
diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 4fecbb08c6..b3509f9f29 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -122,7 +122,7 @@ if($old_ip <> "")
 	if($old_ip <> $curwanip) {
 		exec("/etc/rc.start_packages");		
 		exec("/etc/rc.start_packages");
-		log_error("pfSense package system has detected an ip change $old_ip ->  $curwanip ... Restarting packages.");
+		log_error("{$g['product_name']} package system has detected an ip change $old_ip ->  $curwanip ... Restarting packages.");
 	}
 
 /* reload slbd */
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index 7f70af24cf..09c4d40a8b 100755
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -8,9 +8,11 @@ fi
 if [ -e /dev/ukbd0 ]; then
         /usr/sbin/vidcontrol -s 2
 fi
-        
+
+product=`cat /etc/inc/globals.inc | grep product_name | cut -d'"' -f4`
+
 echo
-echo "pfSense is now shutting down ..."
+echo "$product is now shutting down ..."
 echo
 
 stty status '^T'