Changeset 903 in MondoRescue for trunk/mondo/src

Timestamp:

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

Author:

Bruno Cornec

Message:

merge -r862:888 $SVN_M/branches/stable

Location:

trunk/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-files.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -793 +793 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *envtmp1 = NULL;
+    char *envtmp2 = NULL;
     char *command = NULL;
     char *iso_mnt = NULL;
@@ -854 +856 @@
             /* We need to override prefix value in PXE mode as it's 
              * already done in start-nfs */
+            envtmp1 = getenv("imgname");
+            if (envtmp1 == NULL) {
+                fatal_error("no imgname variable in environment");
+            }
             if (strstr(call_program_and_get_last_line_of_output
                ("cat /proc/cmdline"), "pxe")) {
-                    strcpy(bkpinfo->prefix,getenv("imgname"));
+                    mr_allocstr(bkpinfo->prefix,envtmp1);
             }
 
@@ -985 +991 @@
         /* We need to override values in PXE mode as it's 
          * already done in start-nfs */
+        envtmp1 = getenv("nfsmount");
+        if (envtmp1 == NULL) {
+            fatal_error("no nfsmount variable in environment");
+            }
+        envtmp2 = getenv("dirimg");
+        if (envtmp2 == NULL) {
+            fatal_error("no dirimg variable in environment");
+        }
         if (strstr(call_program_and_get_last_line_of_output
            ("cat /proc/cmdline"), "pxe")) {
-                strcpy(bkpinfo->nfs_mount,getenv("nfsmount"));
-                strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
-            }
+                mr_allocstr(bkpinfo->nfs_mount,envtmp1);
+                mr_allocstr(bkpinfo->nfs_remote_dir,envtmp2);
+        }
     } else if (bkpinfo->backup_media_type == iso) {
         /* Patch by Conor Daly 23-june-2004