Changeset 7102 in vbox for trunk/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh

Timestamp:

Feb 25, 2008 9:49:05 AM (17 years ago)

Author:

vboxsync

Message:

Solaris: fixes for handling existing VNIC on our hostif setup script.

File:

• trunk/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh (modified) (2 diffs)

trunk/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh

@@ -22 +22 @@
 fi
 
-# Try obtain a physical NIC that is currently active
-phys_nic=`/usr/sbin/dladm show-dev | /usr/bin/awk 'NF==7 && $3=="up" { print $1 }'`
-if [ -z "$phys_nic" ]; then
-    # Failed to get a currently active NIC, get the first available NIC.
-    phys_nic=`/usr/sbin/dladm show-link | /usr/bin/nawk '/legacy/ {next} {print $1; exit}'`
-    if [ -z "$phys_nic" ]; then
-        # Failed to get any NICs!
-        echo "Failed to get a physical NIC to bind to."
-        exit 1
-    fi
-fi
-vnic_id=0
-vnic_name=""
 mac=$1
-
 # Create the VNIC if required
 if [ -z "$2" ]; then
+    # Try obtain a physical NIC that is currently active
+    phys_nic=`/usr/sbin/dladm show-dev | /usr/bin/awk 'NF==7 && $3=="up" { print $1 }'`
+    if [ -z "$phys_nic" ]; then
+        # Failed to get a currently active NIC, get the first available NIC.
+        phys_nic=`/usr/sbin/dladm show-link | /usr/bin/nawk '/legacy/ {next} {print $1; exit}'`
+        if [ -z "$phys_nic" ]; then
+            # Failed to get any NICs!
+            echo "Failed to get a physical NIC to bind to."
+            exit 1
+        fi
+    fi
+
     # To use a specific physical NIC, replace $phys_nic with the name of the NIC.
     vnic_id=`/usr/lib/vna $phys_nic $mac`
@@ -76 +74 @@
 
 echo "$vnic_name"
-exit $?
+exit 0