diff options
| author | Marat Nepomnyashy <marat@vyatta.com> | 2007-12-26 16:51:13 -0800 |
|---|---|---|
| committer | Marat Nepomnyashy <marat@vyatta.com> | 2007-12-26 16:51:13 -0800 |
| commit | ea4c396e33bf34cb8272daa2e1b2177a962cffb1 (patch) | |
| tree | d579efec109e9a94bc435864532c5d16c940c861 /templates/system/domain-name | |
| parent | fa71dcd232351c123ac34dcd6622449f9193b0c5 (diff) | |
| download | vyatta-cfg-system-ea4c396e33bf34cb8272daa2e1b2177a962cffb1.tar.gz vyatta-cfg-system-ea4c396e33bf34cb8272daa2e1b2177a962cffb1.zip | |
Treat 'system domain-name $(@)' and 'system domain-search domain $(@)' as mutually exclusive. Generate an error message and refuse commit if both are specified. Bug 2256 fix.
Diffstat (limited to 'templates/system/domain-name')
| -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" |