Changeset 164 in MondoRescue for trunk

Timestamp:

Dec 8, 2005, 12:34:37 PM (18 years ago)

Author:

andree

Message:

Make it so that the -B option script does run even if specified in
conjunction with the -m option (manual CD tray).

Based on a patch by Efraim Feinstein - thank you!

See also Debian bug #278000.

File:

• trunk/mondo/mondo/common/libmondo-tools.c (modified) (2 diffs)

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

@@ -371 +371 @@
     char *tmp;
     char *tmp1;
+    char call_before_iso_user[MAX_STR_LEN] = "\0";
     int rdsiz_MB;
     char *iso_path;
@@ -541 +542 @@
         }
         if (bkpinfo->manual_cd_tray) {
+            if (bkpinfo->call_before_iso[0] == '\0') {
             sprintf(bkpinfo->call_before_iso,
-                    "%s -o %s/temporary.iso . 2>> _ERR_", mondo_mkisofs_sz,
-                    bkpinfo->tmpdir);
+                        "%s -o %s/temporary.iso . 2>> _ERR_",
+                        mondo_mkisofs_sz, bkpinfo->tmpdir);
+                } else {
+                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
+                sprintf (bkpinfo->call_before_iso,
+                                    "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
+                        mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+            }
+            log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
             sprintf(bkpinfo->call_make_iso,
                     "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",