diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 15:07:00 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 15:07:00 -0500 |
commit | 2850f1a0d09ad750b0e44763dfe0ad2e6c6746d7 (patch) | |
tree | d1df8aa34baed7d1c6da7b82a4a4541f6c1242c1 /etc | |
parent | bfaca65530f9ff9eb82279cc497ee2552f48161e (diff) | |
download | pfsense-2850f1a0d09ad750b0e44763dfe0ad2e6c6746d7.zip pfsense-2850f1a0d09ad750b0e44763dfe0ad2e6c6746d7.tar.gz |
Use $g['product_name']
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc | 3 | ||||
-rw-r--r-- | etc/rc.initial_firmware_update | 5 | ||||
-rwxr-xr-x | etc/sshd | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -15,6 +15,7 @@ # Set our operating platform PLATFORM=`cat /etc/platform` +product=`cat /etc/inc/globals.inc | grep product_name | cut -d'"' -f4` HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin @@ -27,7 +28,7 @@ echo cat /etc/ascii-art/pfsense-logo-small.txt echo echo -echo "Welcome to pfSense ${version} on the '${PLATFORM}' platform..." +echo "Welcome to ${product} ${version} on the '${PLATFORM}' platform..." echo if [ "$PLATFORM" = "cdrom" ]; then diff --git a/etc/rc.initial_firmware_update b/etc/rc.initial_firmware_update index a6ab6b4..f4756f2 100644 --- a/etc/rc.initial_firmware_update +++ b/etc/rc.initial_firmware_update @@ -2,10 +2,11 @@ <?php -echo "Starting the pfSense console firmware update system"; - echo "."; require("globals.inc"); + +echo "Starting the {$g['product_name']} console firmware update system"; + $g['booting'] = true; require("functions.inc"); echo "."; @@ -149,7 +149,7 @@ if (!file_exists("$sshConfigDir/ssh_host_key") or file_exists("/etc/keys_generating")) { /* remove previous keys and regen later */ - file_notice("SSH", "pfSense has started creating your SSH keys. SSH Startup will be delayed. Please note that reloading the filter rules and changes will be delayed until this operation is completed.", "SSH KeyGen", ""); + file_notice("SSH", "{$g['product_name']} has started creating your SSH keys. SSH Startup will be delayed. Please note that reloading the filter rules and changes will be delayed until this operation is completed.", "SSH KeyGen", ""); conf_mount_rw(); mwexec("rm /etc/ssh/ssh_host_*"); touch("/etc/keys_generating"); @@ -160,7 +160,7 @@ system("/usr/bin/nice -n20 /usr/bin/ssh-keygen -t dsa -N '' -f $sshConfigDir/ssh_host_dsa_key"); unlink("/etc/keys_generating"); unlink("/tmp/keys_generating"); - file_notice("SSH", "pfSense has completed creating your SSH keys. SSH is now started.", "SSH Startup", ""); + file_notice("SSH", "{$g['product_name']} has completed creating your SSH keys. SSH is now started.", "SSH Startup", ""); echo "Starting SSH... "; } |