Changeset 808 in MondoRescue for trunk/mondo/mondo/common

Timestamp:

Sep 22, 2006, 11:12:37 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r793:807 $SVN_M/branches/stable
src => common for the moment it's easier to manage merges

Location:

trunk/mondo/mondo/common

Files:

• . (moved) (moved from trunk/mondo/mondo/src )
• libmondo-devices.c (modified) (2 diffs)
• libmondo-fifo.c (modified) (1 diff)
• libmondo-files.c (modified) (3 diffs)
• newt-specific.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1823 +1823 @@
                     bkpinfo->media_size[i] = atoi(sz_size);
                 }
-                paranoid_free(sz_size);
-
-                if (!popup_and_get_string
-                    (_("Prefix."),
-                     _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
-                     bkpinfo->prefix)) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-                log_msg(3, "prefix set to %s", bkpinfo->prefix);
             } else {
                 for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -1839 +1829 @@
             }
         }
+        if (!popup_and_get_string
+            ("Prefix.",
+             "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
+             bkpinfo->prefix, MAX_STR_LEN / 4)) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        log_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
     default:

trunk/mondo/mondo/common/libmondo-fifo.c

@@ -158 +158 @@
     sync();
     asprintf(&command,
-            "ps | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
+            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
             g_sz_call_to_buffer);
     paranoid_free(g_sz_call_to_buffer);

trunk/mondo/mondo/common/libmondo-files.c

@@ -1027 +1027 @@
     /*@ buffers ******** */
     char *nfs_dev = NULL;
+    char *mac_addr = NULL;
     char *nfs_mount = NULL;
     char *nfs_client_ipaddr = NULL;
@@ -1051 +1052 @@
 
     asprintf(&nfs_mount, p);
+    /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
@@ -1088 +1090 @@
     }
     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);
+        asprintf(&command,
+                "ifconfig %s | awk '{print $5}'", nfs_dev);
+        mac_addr = call_program_and_get_last_line_of_output(command);
+        asprintf(&command,
+                "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
+        paranoid_free(nfs_dev);
+        nfs_dev = call_program_and_get_last_line_of_output(command);
+        paranoid_free(command);
+        paranoid_free(mac_addr);
+
+        log_to_screen("Replacing it with %s\n", nfs_dev);
+    }
 
     asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);

trunk/mondo/mondo/common/newt-specific.c

@@ -240 +240 @@
 char *tmp = NULL;
 
-asprintf(&tmp,"kill `ps %s | grep \"" %s "\" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
+asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
 run_program_and_log_output(tmp, TRUE);
 paranoid_free(tmp);