Changeset 2887 in MondoRescue for branches/2.2.9/mindi/rootfs/sbin/start-netfs

Timestamp:

Oct 9, 2011, 1:03:19 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds support for hwaddr (MAC addresses) at restore time, and map to the correct NIC if it's found at restore time (based on code from Stefan Heijmans)

File:

• branches/2.2.9/mindi/rootfs/sbin/start-netfs (modified) (3 diffs)

branches/2.2.9/mindi/rootfs/sbin/start-netfs

@@ -12 +12 @@
 # Get info from config file
 ipdev=`grep netfs-dev /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+hwaddr=`grep netfs-client-hwaddr /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipaddress=`grep netfs-client-ipaddr /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipnetmask=`grep netfs-client-netmask /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
@@ -33 +34 @@
 for i in `cat /proc/cmdline` ; do
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
+    echo $i | grep -qi hwaddr= && hwaddr=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
     echo $i | grep -qi netfsmount= && export netfsmount=`echo $i | cut -d= -f2`
@@ -64 +66 @@
             ipgateway=`echo $ipconf | cut -d: -f5`
         fi
+
+        # If same system, map to the right MAC address
+        hwaddr_found=`ifconfig $ipdev | /bin/grep HWaddr | awk '{print $NF}'`
+        if [ "$hwaddr" != "$hwaddr_found" ]; then
+            ipdev_new=`ifconfig -a | /bin/grep $hwaddr | awk '{print $1}'`
+            if [ "$ipdev_new" != "" ]; then
+                LogIt "Interface $ipdev changed to $ipdev_new (MAC: $hwaddr)"
+                ipdev=$ipdev_new
+            else
+                LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+            fi
+        fi
+
         LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
         ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
         route add default gw $ipgateway
+
     fi
+
+    # Leave time to the satck to wake up (reported by some users)
+    sleep 5
 
     # ping server helps waking interface up