summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-01-26 17:16:58 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-01-26 17:16:58 -0800
commitac5a252fc4fa17de06d74e1c643b267489457728 (patch)
tree1d99038edc3eb98ed141ba0d57f1e6f35c83953c
parentd4efe37043d3b74ff7e1610a1f0dcb19a09ce5d1 (diff)
downloadvyatta-cfg-quagga-ac5a252fc4fa17de06d74e1c643b267489457728.tar.gz
vyatta-cfg-quagga-ac5a252fc4fa17de06d74e1c643b267489457728.zip
bridge: handle non ethernet devices in bridge
Eventually, need to be able to devices named something other than 'ethX' into bridge. So use sysfs to find devices.
-rw-r--r--templates/interfaces/bridge/node.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def
index 641d369d..cbf5e9cc 100644
--- a/templates/interfaces/bridge/node.def
+++ b/templates/interfaces/bridge/node.def
@@ -6,7 +6,7 @@ syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)"
create: sudo brctl addbr $VAR(@)
-delete: if [ -n "`/usr/sbin/brctl show | grep $VAR(@) | grep eth`" ]; then
+delete: if [ -z `ls /sys/class/net/$VAR(@)/brif` ]; then
echo "Interfaces are still assigned to bridge $VAR(@)";
exit 1;
fi;