From: Michael Prokop <mika@grml.org>
Date: Wed, 8 Apr 2009 22:13:38 +0000 (+0200)
Subject: Improve error handling in grml-bridge
X-Git-Tag: v0.2.6^0
X-Git-Url: http://git.grml.org/?p=grml-network.git;a=commitdiff_plain;h=2ceeb1f13e6dd0f6efffef9568ee6449135911e6

Improve error handling in grml-bridge
---

diff --git a/sbin/grml-bridge b/sbin/grml-bridge
index c7decc7..c74c8cc 100755
--- a/sbin/grml-bridge
+++ b/sbin/grml-bridge
@@ -45,7 +45,7 @@ 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 $?
                     ;;
@@ -92,7 +92,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 +117,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