X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=sbin%2Fgrml-bridge;h=b15ad9842ed19d66ffe4e5b75596f8e8bd6c5af2;hb=f737aa83b1bff3567e9fedf619f095fca1c84596;hp=c7decc7037b6455c78e5141d7f1bbd767adcfc01;hpb=d9b20539ba8824abdf7a72c73f45f4e940d61e60;p=grml-network.git

diff --git a/sbin/grml-bridge b/sbin/grml-bridge
index c7decc7..b15ad98 100755
--- a/sbin/grml-bridge
+++ b/sbin/grml-bridge
@@ -45,12 +45,20 @@ case "$1" in
                 no|false)
                     ;;
                 *)
-                    einfo "Setting Spanning-Tree Protocol (STP) to status"
+                    einfo "Setting Spanning-Tree Protocol (STP) to status $STP"
                     brctl stp "$BRIDGE_NAME" $STP
                     eend $?
                     ;;
             esac
 
+            einfo "Bringing network device up: "
+            eindent
+               for i in $BRIDGE_DEVICES ; do
+                   einfo "$i"
+                   ifconfig "$i" 0.0.0.0 up ; eend $?
+               done
+            eoutdent
+
             einfo "Enabling promiscous mode on: "
             eindent
                for i in $BRIDGE_DEVICES ; do
@@ -92,7 +100,9 @@ case "$1" in
         eindent
             if [ $BRIDGE_CONFIG = DHCP ]; then
                einfo "Terminating dhclient for $BRIDGE_NAME"
-               kill $(cat /var/run/dhclient.$BRIDGE_NAME.pid);
+               if [ -r "/var/run/dhclient.$BRIDGE_NAME.pid" ] ; then
+                 kill "$(cat /var/run/dhclient.$BRIDGE_NAME.pid)" || /bin/true
+               fi
             fi
             einfo "Removing network devices from $BRIDGE_NAME: "
 
@@ -115,6 +125,7 @@ case "$1" in
             ip link set "$BRIDGE_NAME" down; eend $?
 
             einfo "Removing bridge device"
+            ifconfig "$BRIDGE_NAME" down || /bin/true
             brctl delbr "$BRIDGE_NAME"
             eend $?
         eoutdent