diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-01-03 18:11:50 -0800 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-01-03 18:11:50 -0800 |
| commit | ad7513053936b4712677ee547a13f2b07b49fbef (patch) | |
| tree | b4fd18fd6349b798c9741dd8d83a70d5d637000c /templates/system | |
| parent | 54a57f5ffc98df1097d4d3b7b3e4e0cffe27eb12 (diff) | |
| parent | ea4c396e33bf34cb8272daa2e1b2177a962cffb1 (diff) | |
| download | vyatta-cfg-quagga-ad7513053936b4712677ee547a13f2b07b49fbef.tar.gz vyatta-cfg-quagga-ad7513053936b4712677ee547a13f2b07b49fbef.zip | |
Merge branch 'glendale' of http://suva.vyatta.com/vyatta-cfg-system into glendale
Diffstat (limited to 'templates/system')
| -rw-r--r-- | templates/system/domain-name/node.def | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def index 111061cd..4e3902dc 100644 --- a/templates/system/domain-name/node.def +++ b/templates/system/domain-name/node.def @@ -1,11 +1,9 @@ type: txt help: "Configure system domain name" syntax: pattern $(@) "^[-a-zA-Z0-9.]{0,63}$" ; "invalid domain name $(@)" + # also add localhost line into /etc/hosts (see host-name template)? -update: "sudo sh -c \"if [ x$(@) == x ]; then exit 0; fi && \ -touch /etc/resolv.conf && \ -sed -i '/domain/d' /etc/resolv.conf && \ -echo \\\"domain\t $(@)\\\" >> /etc/resolv.conf\" " +update: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl" + # also update localhost line in /etc/hosts (see host-name template)? -delete: "sudo sh -c \"touch /etc/resolv.conf && \ -sed -i '/domain\\\\t $(@)/d' /etc/resolv.conf\" " +delete: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl" |