diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-11 20:06:18 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-11 20:06:18 -0700 |
| commit | a7a8f7ab9a44071869945c0db085de2cd55f6db5 (patch) | |
| tree | 2e539b200c08a72c11f7177f16c0a89e8f4cf689 | |
| parent | ba68ac21c7a6d186ce753ac8ea0b7bf350b440d7 (diff) | |
| parent | 1fe53b8edbc7f5d51bf05b640eb63b8ebe183560 (diff) | |
| download | vyatta-cfg-a7a8f7ab9a44071869945c0db085de2cd55f6db5.tar.gz vyatta-cfg-a7a8f7ab9a44071869945c0db085de2cd55f6db5.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg into jenner
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/disable/node.def | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index eabcbb7..bfb1092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -283,7 +283,7 @@ vyatta-cfg (0.14.13) unstable; urgency=low * Add new option for checking name validity * Remove script for vyatta-cfg-reload - -- Stephen Hemminger <shemminger@debian> Wed, 11 Feb 2009 21:54:57 -0800 + -- Stephen Hemminger <shemminger@vyatta.com> Wed, 11 Feb 2009 21:54:57 -0800 vyatta-cfg (0.14.12) unstable; urgency=low diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def index 90dd582..b7fcd49 100644 --- a/templates/interfaces/ethernet/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/disable/node.def @@ -1,5 +1,10 @@ help: Set interface disabled -update: /etc/netplug/linkdown.d/dhclient $VAR(../@) +create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show` + if [ ! -z $vif ]; then + echo "Can not disable interface " $VAR(../@) " with vif:" $vif + exit 1 + fi + /etc/netplug/linkdown.d/dhclient $VAR(../@) if ! sudo ip link set $VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../@)" /etc/netplug/linkup.d/dhclient $VAR(../@) |