Changeset 3433 in MondoRescue for branches/3.2

Timestamp:

Aug 28, 2015, 3:19:06 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix the move of NIC when booting with PXE and that the card was renumbered (useing only uppercases MAC addresses for comparison)

File:

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

branches/3.2/mindi/rootfs/usr/sbin/start-netfs

@@ -12 +12 @@
 # Get info from config file
 ipdev=`grep netfs-dev /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
-hwaddr=`grep netfs-client-hwaddr /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+# MAC address in uppercases
+hwaddr=`grep netfs-client-hwaddr /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2- | perl -nle 'print uc;'`
 ipaddress=`grep netfs-client-ipaddr /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipnetmask=`grep netfs-client-netmask /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
@@ -35 +36 @@
 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 hwaddr= && hwaddr=`echo $i | cut -d= -f2  | perl -nle 'print uc;'`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
     echo $i | grep -qi netfsmount= && export netfsmount=`echo $i | cut -d= -f2`
@@ -71 +72 @@
         # If same system, map to the right MAC address
         if [ "$hwaddr" != "" ]; then
-            hwaddr_found=`ifconfig $ipdev | grep HWaddr | awk '{print $NF}'`
+            hwaddr_found=`ifconfig $ipdev | grep HWaddr | awk '{print $NF}' | perl -nle 'print uc;'`
             if [ "$hwaddr" != "$hwaddr_found" ]; then
-                ipdev_new=`ifconfig -a | grep $hwaddr | awk '{print $1}'`
+                ipdev_new=`ifconfig -a | grep -i $hwaddr | awk '{print $1}'`
                 if [ "$ipdev_new" != "" ]; then
-                    LogIt "Interface $ipdev changed to $ipdev_new (MAC: $hwaddr)"
+                    LogIt "Interface with MAC address $hwaddr changed from $ipdev to $ipdev_new"
+                    LogIt "Using $ipdev_new for network configuration from now on"
                     ipdev=$ipdev_new
                 else