Changeset 802 in MondoRescue

Timestamp:

Sep 22, 2006, 6:36:52 PM (18 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix bug #25

Location:

branches/stable

Files:

• mindi/rootfs/sbin/start-nfs (modified) (1 diff)
• mondo/mondo/common/libmondo-files.c (modified) (3 diffs)

branches/stable/mindi/rootfs/sbin/start-nfs

@@ -3 +3 @@
 # $Id$
 #
-# This script setup the network + NFS environment if needed.
+# This script sets up the network + NFS environment if needed.
 #
 

branches/stable/mondo/mondo/common/libmondo-files.c

@@ -1215 +1215 @@
     /*@ buffers ******** */
     char nfs_dev[MAX_STR_LEN];
+    char mac_addr[MAX_STR_LEN];
     char nfs_mount[MAX_STR_LEN];
     char nfs_client_ipaddr[MAX_STR_LEN];
@@ -1237 +1238 @@
     strcpy(nfs_server_ipaddr, tmp);
     strcpy(nfs_mount, p);
+    /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
@@ -1264 +1266 @@
     }
     make_hole_for_dir("/var/cache/mondo-archive");
+    /********
+    * If the NFS device that found above is a bonded device, 
+    * we need to replace it with an ethN device or the
+    * networking will not start during an NFS restore.
+    *
+    * If the NFS device in nfs_dev begins with the word "bond", 
+    * look for the corresponding slave ethN device and copy it to nfs_dev.
+    * Using the common MAC address
+    ********/
+    if (!strncmp(nfs_dev, "bond", 4)) {
+        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
+        sprintf(command,
+                "ifconfig %s | awk '{print $5}'", nfs_dev);
+        strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
+        sprintf(command,
+                "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
+        strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
+        log_to_screen("Replacing it with %s\n", nfs_dev);
+    }
 
     sprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);