diff options
| author | root <root@lenny.vyatta.com> | 2007-11-05 15:21:23 -0800 |
|---|---|---|
| committer | root <root@lenny.vyatta.com> | 2007-11-05 15:21:23 -0800 |
| commit | d8ed99c5bb309294a7139d3a140686d28cd18eb0 (patch) | |
| tree | 1c7b3d2d90a2237679c0f66fe9d145f6c907a322 | |
| parent | 1953e95aec55ddfa9697a7ae9fa9f3a733f27986 (diff) | |
| parent | 84af1d1e7ba996a5bdccb409d5146ebf250288df (diff) | |
| download | vyatta-cfg-system-d8ed99c5bb309294a7139d3a140686d28cd18eb0.tar.gz vyatta-cfg-system-d8ed99c5bb309294a7139d3a140686d28cd18eb0.zip | |
Merge branch 'master' of ssh://rbays@phuket.vyatta.com/usr/local/git/vyatta-cfg-system
| -rwxr-xr-x | scripts/rl-system.init | 13 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vrrp/authentication/password/node.def | 2 |
2 files changed, 1 insertions, 14 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 diff --git a/templates/interfaces/ethernet/node.tag/vrrp/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vrrp/authentication/password/node.def index e79fc313..87855962 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/authentication/password/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/authentication/password/node.def @@ -1,2 +1,2 @@ type: txt -help: "password text" +help: "Password text" |