diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-30 14:33:12 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-30 14:33:36 -0300 |
| commit | c580e34c6fe24107817d6a72956e77b23f043beb (patch) | |
| tree | 5b2a610df5a8a167ed0d32b48b03611e07489886 /src/etc/rc.initial | |
| parent | 205c51a217d29316334aebbc0cbc123794ba5160 (diff) | |
| download | pfsense-c580e34c6fe24107817d6a72956e77b23f043beb.zip pfsense-c580e34c6fe24107817d6a72956e77b23f043beb.tar.gz | |
Consider globals_override.inc and replace hard coded pfSense string by product_name
Diffstat (limited to 'src/etc/rc.initial')
| -rwxr-xr-x | src/etc/rc.initial | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/etc/rc.initial b/src/etc/rc.initial index 4a38341..b6ef02c 100755 --- a/src/etc/rc.initial +++ b/src/etc/rc.initial @@ -44,8 +44,17 @@ fi /etc/rc.banner -product=`grep product_name /etc/inc/globals.inc | cut -d'"' -f4` -hidebanner=`grep hidebanner /etc/inc/globals.inc | cut -d'"' -f4` +globals_inc="/etc/inc/globals.inc" +if [ -f /etc/inc/globals_override.inc ]; then + globals_inc="/etc/inc/globals_override.inc ${globals_inc}" +fi +product=$(cat ${globals_inc} | \ + grep product_name | \ + head -n 1 | \ + sed 's/^.*=>* *//; s/["\;,]*//g') + +# product cannot be blank +product=${product:-"pfSense"} # Check to see if SSH is running. if pgrep -q -a -F /var/run/sshd.pid sshd >/dev/null 2>&1; then @@ -128,7 +137,7 @@ case ${opmode} in /usr/local/sbin/pfSsh.php ;; 13) - /bin/sh /usr/local/sbin/pfSense-upgrade + /bin/sh /usr/local/sbin/${product}-upgrade ;; 14) php -f /etc/rc.initial.toggle_sshd |
