From f6e1525cde05acf072129a357e02bedcd14d79c9 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 15 Aug 2001 20:20:46 +0000
Subject: add is_available() function for network devices; use it. gets rid of
 horribly ugly modprobe messages

---
 sysconfig/network-scripts/ifup | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'sysconfig/network-scripts/ifup')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 0ea87418..aec95481 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -85,18 +85,14 @@ if [ -x ${OTHERSCRIPT} ]; then
     exec ${OTHERSCRIPT} ${CONFIG} $2
 fi
 
-# is this device available? (this catches PCMCIA devices for us)
-LC_ALL= LANG= ip -o link | grep -q ${REALDEVICE}
-if [ "$?" = "1" ]; then
-    alias=`modprobe -c | awk "/^alias ${REALDEVICE} / { print \\$3 }"`
-    if [ -z "$alias" -o "$alias" = "off" ]; then
-    	exit 0
-    fi
-    modprobe $alias || {
-      echo $"$alias device does not seem to be present, delaying ${DEVICE} initialization."
-      exit 1
-    }
-fi
+is_available ${REALDEVICE} || {
+      if [ "$?" = "1" ] ; then
+         echo $"$alias device does not seem to be present, delaying ${DEVICE} initialization."
+         exit 1
+      else
+         exit 0
+      fi
+}
 if [ -n "${HWADDR}" ]; then
     FOUNDMACADDR=`LC_ALL= LANG= ip -o link show ${REALDEVICE} | \
 	sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/'`
-- 
cgit v1.2.1