Changeset 148 in MondoRescue for branches/2.05/mondo/mondo/common/libmondo-tools.c

Timestamp:

Dec 2, 2005, 8:22:32 PM (18 years ago)

Author:

bcornec

Message:

• Bug on USB keyboard corrected
• PXE mode reviewed (netmask and route management added in start-nfs)
• -p option with PXE doesn't require a parameter anymore and it now works with the parameter
• -p option should work correctly with iso and nfs modes
• cosmetic messages improvement for mindi
• use STD_PREFIX

File:

• branches/2.05/mondo/mondo/common/libmondo-tools.c (modified) (4 diffs)

branches/2.05/mondo/mondo/common/libmondo-tools.c

@@ -826 +826 @@
         write_one_liner_data_file(tmp, iso_path);
         log_it("isodir: %s", iso_path);
+        sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->prefix);
+        log_it("iso-prefix: %s",  bkpinfo->prefix);
 
 /* End patch */
@@ -969 +972 @@
         strcpy(bkpinfo->isodir, "/root/images/mondo");
     }
-    strcpy(bkpinfo->prefix, "mondorescue");
+    strcpy(bkpinfo->prefix, STD_PREFIX);
 
     bkpinfo->scratchdir[0] = '\0';
@@ -1261 +1264 @@
         return (0);
     } else {
-        sprintf(command, "cat %s | grep \"%s .*\" | cut -d' ' -f2,3,4,5",
-                config_file, label);
+        sprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
+                label, config_file);
         strcpy(value, call_program_and_get_last_line_of_output(command));
         if (strlen(value) == 0) {
@@ -1477 +1480 @@
            ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
     if (does_file_exist(config_file)) {
-        sprintf(command, "cat %s | grep -vx \"%s .*\" > %s", config_file,
-                label, tempfile);
+        sprintf(command, "grep -vx '%s .*' %s > %s",
+                label, config_file, tempfile);
         paranoid_system(command);
     }