Changeset 903 in MondoRescue for trunk/mondo/src/common

Timestamp:

Oct 25, 2006, 1:49:52 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r862:888 $SVN_M/branches/stable

Location:

trunk/mondo/src/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-files.c (modified) (1 diff)

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

@@ -1578 +1578 @@
             if (bkpinfo->media_device != NULL) {
                 mr_asprintf(&tmp,
-                        _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
+                        _("I think I've found your %s burner at SCSI node %s; Is this correct ? (say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details."),
                         bkpinfo->backup_media_string,
                         bkpinfo->media_device);

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

@@ -1109 +1109 @@
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
         mr_asprintf(&command,
-                "ifconfig %s | awk '{print $5}'", nfs_dev);
+                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         mac_addr = call_program_and_get_last_line_of_output(command);
         mr_asprintf(&command,
-                "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr);
         mr_free(nfs_dev);
         nfs_dev = call_program_and_get_last_line_of_output(command);