Changeset 2887 in MondoRescue for branches/2.2.9/mondo/src

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/mondo/src/common/libmondo-files.c (modified) (5 diffs)

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);