Changeset 164 for trunk/mondo/mondo


Ignore:
Timestamp:
Dec 8, 2005, 12:34:37 PM (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/common/libmondo-tools.c

    r149 r164  
    371371    char *tmp;
    372372    char *tmp1;
     373    char call_before_iso_user[MAX_STR_LEN] = "\0";
    373374    int rdsiz_MB;
    374375    char *iso_path;
     
    541542        }
    542543        if (bkpinfo->manual_cd_tray) {
     544            if (bkpinfo->call_before_iso[0] == '\0') {
    543545            sprintf(bkpinfo->call_before_iso,
    544                     "%s -o %s/temporary.iso . 2>> _ERR_", mondo_mkisofs_sz,
    545                     bkpinfo->tmpdir);
     546                        "%s -o %s/temporary.iso . 2>> _ERR_",
     547                        mondo_mkisofs_sz, bkpinfo->tmpdir);
     548                } else {
     549                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
     550                sprintf (bkpinfo->call_before_iso,
     551                                    "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
     552                        mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
     553            }
     554            log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
    546555            sprintf(bkpinfo->call_make_iso,
    547556                    "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",
Note: See TracChangeset for help on using the changeset viewer.