From ea4c396e33bf34cb8272daa2e1b2177a962cffb1 Mon Sep 17 00:00:00 2001
From: Marat Nepomnyashy <marat@vyatta.com>
Date: Wed, 26 Dec 2007 16:51:13 -0800
Subject: 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.

---
 templates/system/domain-name/node.def | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'templates/system/domain-name/node.def')

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"
-- 
cgit v1.2.3

