Changeset 1594 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c

Timestamp:

Aug 26, 2007, 12:26:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use of conf file entries (iso_burning_*, media_device, media_size)
and adapatation of the rest of the code to that (including bkpinfo)

File:

• branches/stable/mondo/src/common/libmondo-stream.c (modified) (2 diffs)

branches/stable/mondo/src/common/libmondo-stream.c

@@ -329 +329 @@
     log_it("At this point, dev = %s and res = %d", dev, res);
 
-    strcpy(tmp, call_program_and_get_last_line_of_output("\
-cdrecord -scanbus 2> /dev/null | tr -s '\t' ' ' | \
-grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | \
-awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'"));
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'", cdr_exe);
+    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
 
     siz[0] = '\0';
@@ -1296 +1295 @@
         mr_asprintf(&command,
                  "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
-                 bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
+                 bkpinfo->iso_burning_dev, bkpinfo->writer_speed, MONDO_LOGFILE,
                  MONDO_LOGFILE);
         log_it("Opening OUT to next CD with the command");