summaryrefslogtreecommitdiff
path: root/templates/service/dns
diff options
context:
space:
mode:
authorRobert Bays <rbays@cartagena.vyatta.com>2008-09-03 18:22:19 -0400
committerRobert Bays <rbays@cartagena.vyatta.com>2008-09-03 18:22:19 -0400
commit0740e78bcdea29ca5fb34ab3fb05edbcf3aaf3e6 (patch)
tree327755924533310e81bc2d24b5035c920d465e31 /templates/service/dns
parent11eca774916110faaf375470c9a4d73c498d8cae (diff)
parenta43151a69c1482c1c10806e83271f94fb691199d (diff)
downloadvyatta-cfg-quagga-0740e78bcdea29ca5fb34ab3fb05edbcf3aaf3e6.tar.gz
vyatta-cfg-quagga-0740e78bcdea29ca5fb34ab3fb05edbcf3aaf3e6.zip
Merge branch 'islavista' of http://git.vyatta.com/vyatta-cfg-system into islavista
Conflicts: scripts/install-system
Diffstat (limited to 'templates/service/dns')
-rw-r--r--templates/service/dns/forwarding/dhcp/node.def5
1 files changed, 2 insertions, 3 deletions
diff --git a/templates/service/dns/forwarding/dhcp/node.def b/templates/service/dns/forwarding/dhcp/node.def
index c9167431..8ce8c83f 100644
--- a/templates/service/dns/forwarding/dhcp/node.def
+++ b/templates/service/dns/forwarding/dhcp/node.def
@@ -1,8 +1,7 @@
multi:
type: txt
-help: Set to forward DNS queries to nameservers received from DHCP server for specified interface
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --dhcp-interface $VAR(@)"
-commit:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --dhcp-interface-nameserver $VAR(@)"
+help: Set to use nameservers received from DHCP server for specified interface
+commit:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --dhcp-interface $VAR(@)"
allowed:
local -a array ;
array=( /var/lib/dhcp3/eth* /var/lib/dhcp3/br* ) ;