summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Fletcher <jfletcher@phuket.vyatta.com>2007-11-05 14:58:10 -0800
committerJustin Fletcher <jfletcher@phuket.vyatta.com>2007-11-05 14:58:10 -0800
commit84af1d1e7ba996a5bdccb409d5146ebf250288df (patch)
treedd2b7701eb066f34bfcd36ed4fcd8a671ccb8df1
parent3894a62d87d3813a4bf1a5d76510939222ee5549 (diff)
parent96d531ad3a5ebcb3719924af73dd529b6bc9a571 (diff)
downloadvyatta-cfg-system-84af1d1e7ba996a5bdccb409d5146ebf250288df.tar.gz
vyatta-cfg-system-84af1d1e7ba996a5bdccb409d5146ebf250288df.zip
Merge branch 'master' of /usr/local/git/vyatta-cfg-system
-rwxr-xr-xscripts/rl-system.init13
1 files changed, 0 insertions, 13 deletions
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 21851ef0..8d933b2d 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -281,18 +281,6 @@ set_promote_secondaries () {
echo 1 > /proc/sys/net/ipv4/conf/all/promote_secondaries
}
-## if present use hostname from config file
-maybe_hostname () {
- hn=$(sed -n '/^system {$/,/^}$/ {
- /^ \+host-name:/ {
- s/^[^:]*: *//
- s/"//g
- p
- }
- }' $BOOTFILE )
- test -n "$hn" && hostname ${hn}
-}
-
## Update the version information
update_version_info () {
if [ -f ${ofr_sysconfdir}/version.master ]; then
@@ -327,7 +315,6 @@ start () {
reset_promiscous_arp_response
set_ip_forwarding
set_promote_secondaries
- maybe_hostname
update_version_info
clear_apt_config
add_snmp_stats_module