From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sat, 5 Mar 2011 20:24:31 +0000 (+0000)
Subject: Vérification si interface réseau existe avant de l'activer/désactiver
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=a456f5191f6c754379a19ae57fcfc07a5401091f;p=hvlinux.git

Vérification si interface réseau existe avant de l'activer/désactiver
---

diff --git a/stage2/bootscripts/ifdown b/stage2/bootscripts/ifdown
index 52a20df..115c488 100755
--- a/stage2/bootscripts/ifdown
+++ b/stage2/bootscripts/ifdown
@@ -23,6 +23,12 @@ check_brctl()
     fi
 }
 
+# First make sure interface is available
+if ! ip link show ${DEVICE} ; then
+    echo "Interface ${DEVICE} not available"
+    exit ${EXIT_CODE_WARNING}
+fi
+
 if [ "x${BOOTPROTO}" = "xdhcp" ]; then
     # DHCP configuration
 
diff --git a/stage2/bootscripts/ifup b/stage2/bootscripts/ifup
index 4224c47..b8fc5e8 100755
--- a/stage2/bootscripts/ifup
+++ b/stage2/bootscripts/ifup
@@ -23,6 +23,12 @@ check_brctl()
     fi
 }
 
+# First make sure interface is available
+if ! ip link show ${DEVICE} ; then
+    echo "Interface ${DEVICE} not available"
+    exit ${EXIT_CODE_WARNING}
+fi
+
 # Determining if the interface is a bridge:
 if [ "x${BRIDGE}" = "xyes" ]; then
     check_brctl
diff --git a/stage2/bootscripts/network b/stage2/bootscripts/network
index f42ea1f..70ac088 100755
--- a/stage2/bootscripts/network
+++ b/stage2/bootscripts/network
@@ -28,7 +28,7 @@ case "$1" in
     start)
 	for i in ${INTERFACES_UP}; do
 	    if LANG=C egrep -L "^ONBOOT=\"?[Yy][Ee][Ss]\"?" ifconfig.$i >/dev/null 2>&1 ; then
-		cmd_run_log_box "Ethernet Adapter <$i> init" /etc/rc.d/init.d/ifup "$i"
+		cmd_run_log_box_warn "Ethernet Adapter <$i> init" /etc/rc.d/init.d/ifup "$i"
 	    fi
 	done
         ;;
@@ -36,7 +36,7 @@ case "$1" in
     stop)
 	for i in ${INTERFACES_DN} ; do
 	    if LC_ALL= LANG= ip link show dev $i 2> /dev/null | grep -q "UP" >/dev/null 2>&1 ; then
-		cmd_run_log_box "Ethernet Adapter <$i> stop" /etc/rc.d/init.d/ifdown "$i"
+		cmd_run_log_box_warn "Ethernet Adapter <$i> stop" /etc/rc.d/init.d/ifdown "$i"
 	    fi
 	done
         ;;