Changeset 3443 in MondoRescue for branches/3.2/mindi/rootfs/usr/sbin/start-netfs

Timestamp:

Aug 29, 2015, 1:53:47 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Adds an ipmode configuration parameter at boot time to typically force start-netfs to make a DHCP request, despite the conf file doesn't precise it (parm can be DHCP or STATIC)
• Review again the strategy when the simple case of NIC unchanged and IP conf either is not verified. Trust ipconf first, and then use mondorestore.cfg content, trying to find the right NIC withthe corresponding MAC address in the file, if the stored NIC isn't named identically anymore.

File:

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

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

@@ -21 +21 @@
 iproute=`grep netfs-route /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipconf=""
+ipmode="STATIC"
 pre=""
 post=""
@@ -46 +47 @@
     echo $i | grep -qi proto= && proto=`echo $i | cut -d= -f2`
     echo $i | grep -qi iproute= && iproute=`echo $i | cut -d= -f2`
+    echo $i | grep -qi ipmode= && ipmode=`echo $i | cut -d= -f2`
 done
 
@@ -56 +58 @@
     ifconfig lo 127.0.0.1
 
-    echo "$ipconf" | grep -q "dhcp"
-    if [ $? -eq 0 ]; then
-        ipdev=`echo $ipconf | cut -d: -f1`
-        LogIt "Making DHCP request on $ipdev"
-        udhcpc -i $ipdev
-    else
-        if [ "$ipconf" != "" ]; then
+    # ipconf has priority
+    if [ "$ipconf" != "" ]; then
+        echo "$ipconf" | grep -q "dhcp"
+        if [ $? -eq 0 ]; then
+            ipdev=`echo $ipconf | cut -d: -f1`
+            ipmode="DHCP"
+        else
             ipdev=`echo $ipconf | cut -d: -f1`
             ipaddress=`echo $ipconf | cut -d: -f2`
@@ -69 +71 @@
             ipgateway=`echo $ipconf | cut -d: -f5`
         fi
+    else
+        # Now relying on ipdev which isn't empty
+        # ipmode is either STATIC by default or DHCP if a parameter was passed
+        # If same system, map to the right MAC address
 
-        # If same system, map to the right MAC address
-        if [ "$hwaddr" != "" ]; then
-            hwaddr_found=`ifconfig $ipdev | grep HWaddr | awk '{print $NF}' | tr '[a-z]' '[A-Z]'`
-            if [ "$hwaddr" != "$hwaddr_found" ]; then
-                ipdev_new=`ifconfig -a | grep -i $hwaddr | awk '{print $1}'`
-                if [ "$ipdev_new" != "" ]; then
-                    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
-                    LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+        # Look at our previous device
+        hwaddr_found=`ifconfig $ipdev 2> /dev/null | grep HWaddr | awk '{print $NF}' | tr '[a-z]' '[A-Z]'`
+        if [ "$hwaddr_found" != "" ]; then
+            # That device always exists
+            if [ "$hwaddr" = "$hwaddr_found" ]; then
+                # No renaming took place use it
+            fi
+        else
+            # maybe there was a change of NIC numbering e.g. 
+            # and the one used at backup doesn't exist anymore
+            # ipdev is not good anymore probably
+            oldipdev=$ipdev
+
+            for hwdev in `ifconfig -a | grep HWaddr | awk '{print $1}'` ; do
+                mac=`ifconfig $hwdev | grep HWaddr | awk '{print $NF}' | tr '[a-z]' '[A-Z]'`
+                if [ "$hwaddr" = "$mac" ]; then
+                    # This is the new device for the MAC address of our card at backup time
+                    LogIt "Interface with MAC address $hwaddr changed from $ipdev to $hwdev"
+                    LogIt "Using $hwdev for network configuration from now on"
+                    ipdev=$hwdev
+                    break
                 fi
+            done
+
+            if [ "$oldipdev" = "$ipdev" ]; then
+                # We didn't find a new device for this MAC
+                LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+                ipdev=$oldipdev
+            fi
+
+            # TODO: Should we do that ?
+            if [ "$hwaddr" = "" ]; then
+                # No hwaddr stored at backup
+                # take the first interface and hope it's good
+                ipdev=`ifconfig -a | grep HWaddr | awk '{print $1}' | head -1`
             fi
         fi
+    fi
 
-        LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
+    if [ "$ipmode" = "DHCP" ]; then
+        LogIt "Making DHCP request on $ipdev"
+        udhcpc -i $ipdev
+    else
+        LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask/$ipgateway)"
         ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
         route add default gw $ipgateway
-
     fi
-
     # Leave time to the stack to wake up (reported by some users)
     sleep 5