summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-16 12:06:27 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-16 12:06:27 -0800
commite96f7417133fbc1734dca4b45aa563174249193e (patch)
treedd3c63ee2d46a5d6b83e6d38a2860c0ac8d3930f
parent4c575ed0f85df4814272c23698834ca983d07e03 (diff)
parent735f56914eeb409dcf850662d4e60db462fb7213 (diff)
downloadvyatta-op-e96f7417133fbc1734dca4b45aa563174249193e.tar.gz
vyatta-op-e96f7417133fbc1734dca4b45aa563174249193e.zip
Merge branch 'kenwood' of 192.168.100.1:vyatta/kenwood/vyatta-op into kenwood
-rw-r--r--templates/release/dhcp/interface/node.tag/node.def4
-rw-r--r--templates/renew/dhcp/interface/node.tag/node.def4
2 files changed, 2 insertions, 6 deletions
diff --git a/templates/release/dhcp/interface/node.tag/node.def b/templates/release/dhcp/interface/node.tag/node.def
index 834e682..a5cd912 100644
--- a/templates/release/dhcp/interface/node.tag/node.def
+++ b/templates/release/dhcp/interface/node.tag/node.def
@@ -4,6 +4,4 @@ allowed:
array=( /var/lib/dhcp3/eth* /var/lib/dhcp3/br* /var/lib/dhcp3/bond* ) ;
echo -n ${array[@]##*/}
-run:
- IFNAME=${4}
- sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --op-command "dhcp-release" --dev "$IFNAME"
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --dhcp release --dev "$4"
diff --git a/templates/renew/dhcp/interface/node.tag/node.def b/templates/renew/dhcp/interface/node.tag/node.def
index 84e4cc0..ab6494d 100644
--- a/templates/renew/dhcp/interface/node.tag/node.def
+++ b/templates/renew/dhcp/interface/node.tag/node.def
@@ -4,6 +4,4 @@ allowed:
array=( /var/lib/dhcp3/eth* /var/lib/dhcp3/br* /var/lib/dhcp3/bond* ) ;
echo -n ${array[@]##*/}
-run:
- IFNAME=${4}
- sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --op-command "dhcp-renew" --dev "$IFNAME"
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --dhcp renew --dev "$4"