handle multiple NIC environments

faiproject · Oct 28, 2017 · 3e434d0 · 3e434d0
1 parent 8c9356f
commit 3e434d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/get-boot-info b/lib/get-boot-info
@@ -75,14 +75,14 @@ setnet() {
     # determine the name of the default network interface
     # try several times if dhclient needs some more time
     local i=0
-    NIC1=$(ip route | awk '/^default/ {print $5}')
+    NIC1=$(ip route | awk '/^default/ {print $5}'|head -1)
     while [ ! "$NIC1" -a $i -lt 8 ]; do
         sleep 2
-	NIC1=$(ip route | awk '/^default/ {print $5}')
+	NIC1=$(ip route | awk '/^default/ {print $5}'|head -1)
         (( i += 1 ))
     done
     if [ -z "$NIC1" ]; then
-	NIC1=$(ip route | awk '/ dev / {print $3}')
+	NIC1=$(ip route | awk '/ dev / {print $3}'|head -1)
     fi
 
     read IPADDR NETMASK BROADCAST dummy<<<$(ifdata -p $dev)

diff --git a/lib/task_inventory b/lib/task_inventory
@@ -24,7 +24,7 @@ inventory() {
     echo "CPU: $cpuname"
     echo "Number of CPU/Cores: $ncpu"
 
-    nic1=$(ip route | awk '/^default/ {print $5}')
+    nic1=$(ip route | awk '/^default/ {print $5}'|head -1)
     mac1=$(< /sys/class/net/$nic1/address)
     echo "Network interface: $nic1"
     echo "MAC address: $mac1"