Changeset 2887 in MondoRescue

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)

Location:

branches/2.2.9

Files:

• mindi/README.pxe (modified) (3 diffs)
• mindi/mindi (modified) (1 diff)
• mindi/rootfs/sbin/start-netfs (modified) (3 diffs)
• mondo/src/common/libmondo-files.c (modified) (5 diffs)

branches/2.2.9/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [hwaddr=M:A:C:A:D:R] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)
@@ -19 +19 @@
 gateway is the default gateway (e.g. 192.168.1.254)
 dhcp is a keyword. Using it will provide all the previous 4 values to activate the LAN interface.
+hwaddr is the MAC address of the device you want to use to restore through
 proto is the protocol to use for mounting the remote share (default is NFS, sshfs is also available)
 server is the ip addr of the Remote Network server
@@ -48 +49 @@
 CAVEAT: the limit to the number of char on the append line is 255. Use symlinks to reduce the size of your path if needed.
 
-Please report any problem around that tool to bruno@mondorescue.org
+Please report any problem around that tool to bruno_at_mondorescue.org
 
+2011-10-09 adds support for hwaddr
 2009-12-05 nfsopt added tp allow for custom options at mount time
 2009-09-09 Changed to netfs for multi protocol support (nfs, sshfs, ...)

branches/2.2.9/mindi/mindi

@@ -991 +991 @@
     AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-NETMASK netfs-client-netmask $outfile
     AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-BROADCAST netfs-client-broadcast $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-HWADDR netfs-client-hwaddr $outfile
     AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-DEFGW  netfs-client-defgw  $outfile
     AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-MOUNT  netfs-server-mount  $outfile

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

branches/2.2.9/mondo/src/common/libmondo-files.c

@@ -1103 +1103 @@
     /*@ buffers ******** */
     char netfs_dev[MAX_STR_LEN];
-    char mac_addr[MAX_STR_LEN];
     char netfs_mount[MAX_STR_LEN];
+    char netfs_client_hwaddr[MAX_STR_LEN];
     char netfs_client_ipaddr[MAX_STR_LEN];
     char netfs_client_netmask[MAX_STR_LEN];
@@ -1131 +1131 @@
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
     strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
+    strcpy(netfs_client_hwaddr, call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
@@ -1148 +1151 @@
            call_program_and_get_last_line_of_output(command));
     sprintf(tmp,
-            "netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s",
-            netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
+            "netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s",
+            netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
     if (strlen(netfs_dev) < 2) {
         fatal_error
@@ -1166 +1169 @@
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
         sprintf(command,
-                "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
-        strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
-        sprintf(command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,netfs_dev);
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1",netfs_client_hwaddr,netfs_dev);
         strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
         log_to_screen("Replacing it with %s\n", netfs_dev);
@@ -1180 +1180 @@
     write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
 
+    sprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_hwaddr);
     sprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_ipaddr);