diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2007-12-10 18:54:51 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2007-12-10 18:54:51 -0800 |
| commit | 43f2852dd74d9dd60d955478d8d7035ebacef46b (patch) | |
| tree | 60eb97111bc596951be8ea2a7ee59b7c541fdcca | |
| parent | 41dce94fe7ce2518a2a83387d3c88384c42ed203 (diff) | |
| download | vyatta-cfg-system-43f2852dd74d9dd60d955478d8d7035ebacef46b.tar.gz vyatta-cfg-system-43f2852dd74d9dd60d955478d8d7035ebacef46b.zip | |
use "127.0.1.1" for configured hostname (leave "127.0.0.1" for localhost).
| -rw-r--r-- | templates/system/host-name/node.def | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def index aeed3986..97d9a36b 100644 --- a/templates/system/host-name/node.def +++ b/templates/system/host-name/node.def @@ -2,21 +2,17 @@ type: txt help: "Configure system host name" default: "vyatta" syntax: pattern $(@) "^[-a-zA-Z0-9.]+$" ; "invalid host name $(@)" -# do we need to add ntpd restart here? update: "sudo sh -c \"hostname '$(@)' && \ touch /etc/hosts && \ -sed -i '/localhost/d' /etc/hosts && \ -echo \\\"127.0.0.1\t localhost $(@)\t #vyatta entry\\\" >> /etc/hosts && \ +sed -i '/^127.0.1.1/d' /etc/hosts && \ +echo \\\"127.0.1.1\t $(@)\t #vyatta entry\\\" >> /etc/hosts && \ if [ x$(../domain-name/@) != x ]; then \ -echo \\\"127.0.0.1\t localhost $(@).$(../domain-name/@)\t #vyatta entry\\\" \ +echo \\\"127.0.1.1\t $(@).$(../domain-name/@)\t #vyatta entry\\\" \ >> /etc/hosts; fi\" " -# do we need to add ntpd restart here? delete: "sudo sh -c \"echo > /etc/hostname.conf && hostname 'vyatta' && \ touch /etc/hosts && \ -sed -i '/localhost.*#vyatta entry/d' /etc/hosts && \ -echo \\\"127.0.0.1\t localhost vyatta\t #vyatta entry\\\" >> /etc/hosts && \ +sed -i '/^127.0.1.1/d' /etc/hosts && \ +echo \\\"127.0.1.1\t vyatta\t #vyatta entry\\\" >> /etc/hosts && \ if [ x$(../domain-name/@) != x ]; then \ -echo \\\"127.0.0.1\t localhost vyatta.$(../domain-name/@)\t #vyatta entry\\\" \ ->> /etc/hosts; fi && \ -if [ -f /etc/ntp/ntp.conf ] && grep -q 'server' /etc/ntp/ntp.conf; then \ -/opt/vyatta/sbin/ntpd.init restart; fi\" " +echo \\\"127.0.1.1\t vyatta.$(../domain-name/@)\t #vyatta entry\\\" \ +>> /etc/hosts; fi\" " |