Changeset 3907 in vbox for trunk/src

Timestamp:

Jul 27, 2007 2:27:44 PM (17 years ago)

Author:

vboxsync

Message:

Fixed a problem with host networking on SLES 10.1 whereby the interfaces were not brought up properly

Location:

trunk/src/VBox/Installer/linux

Files:

• VBoxAddIF.sh (modified) (1 diff)
• vboxnet.sh (modified) (1 diff)

trunk/src/VBox/Installer/linux/VBoxAddIF.sh

@@ -210 +210 @@
       exit 1
     fi
-    ifconfig $interface up > /dev/null 2>&1
+    # On SUSE Linux Enterprise Server, the tunctl command does not take
+    # effect at once, so we loop until it does.
+    i=1
+    while [ $i -le 10 ]
+    do
+      ifconfig "$interface" up > /dev/null 2>&1
+      if ifconfig | grep "$interface" up > /dev/null 2>&1
+      then
+        i=11
+      else
+        i=`expr $i + 1`
+        sleep .1
+      fi
+    done
     if [ ! -z "$bridge" ]
     then

trunk/src/VBox/Installer/linux/vboxnet.sh

@@ -198 +198 @@
         then
           # Try to create the interface
-          if (VBoxTunctl -t "$1" -u "$2" > /dev/null 2>&1 &&
-              ifconfig "$1" up 2> /dev/null)
+          if VBoxTunctl -t "$1" -u "$2" > /dev/null 2>&1
           then
-            # Add the interface to a bridge if one was specified
-            if [ ! -z "$3" ]
+            # On SUSE Linux Enterprise Server, the interface does not
+            # appear immediately, so we loop trying to bring it up.
+            i=1
+            while [ $i -le 10 ]
+            do
+              ifconfig "$1" up 2> /dev/null
+              if ifconfig | grep "$1" > /dev/null 2>&1
+              then
+                # Add the interface to a bridge if one was specified
+                if [ ! -z "$3" ]
+                then
+                  if brctl addif "$3" "$1" 2> /dev/null
+                  then
+                    echo "$1 $2 $3" > "$VARFILE"
+                  else
+                    echo "$1 $2" > "$VARFILE"
+                    echo "Warning - failed to add interface $1 to the bridge $3"
+                  fi
+                else
+                  echo "$1 $2" > $VARFILE
+                fi
+                i=20
+              else
+                i=`expr $i + 1`
+                sleep .1
+              fi
+            done
+            if [ $i -ne 20 ]
             then
-              if brctl addif "$3" "$1" 2> /dev/null
-              then
-                echo "$1 $2 $3" > "$VARFILE"
-              else
-                echo "$1 $2" > "$VARFILE"
-                echo "Warning - failed to add interface $1 to the bridge $3"
-              fi
-            else
-              echo "$1 $2" > $VARFILE
+              echo "Warning - failed to bring up the interface $1"
             fi
           else
-            echo "Warning - invalid line in $CONFIG:"
-            echo "  $line"
+            echo "Warning - failed to create the interface $1 for the user $2"
           fi
         else