Ignore:
Timestamp:
Nov 19, 2005, 2:27:31 AM (14 years ago)
Author:
bcornec
Message:

merge -r 125:126 $SVN_M/branches/2.05

File:
1 edited

Legend:

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

    r89 r127  
    358358    paranoid_free(command);
    359359
    360     asprintf(&command, "cat %s | afio -o -b %ld -M 16m %s %s 2>> %s",
    361              filelist, TAPE_BLOCK_SIZE, zipparams, fname, MONDO_LOGFILE);
     360    asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
     361             TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
    362362    paranoid_free(zipparams);
    363363
     
    556556
    557557    asprintf(&tmp,
    558              "echo \"%s\" | tr -s ' ' '\n' | grep -x \"/dev/.*\" | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
     558             "echo '%s' | tr -s ' ' '\n' | grep -x '/dev/.*' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
    559559             bkpinfo->exclude_paths);
    560560    asprintf(&devs_to_exclude,
     
    8328326=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
    83383311=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
    834              "mindi --custom %s %s/images \"%s\" \"%s\" \
    835 \"%s\" %ld \"%s\" \"%s\" \"%s\" \
    836 \"%s\" %s %ld \"%s\" \"%s\" \"%s\" \"%s\" %ld %d %s", bkpinfo->tmpdir,  // parameter #2
     834             "mindi --custom %s %s/images '%s' '%s' \
     835'%s' %ld '%s' '%s' '%s' \
     836'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d %s", bkpinfo->tmpdir,    // parameter #2
    837837             bkpinfo->scratchdir,   // parameter #3
    838838             bkpinfo->kernel_path,  // parameter #4
     
    917917    } else {
    918918        log_to_screen("Mindi failed to create your boot+data disks.");
    919         asprintf(&command, "cat %s | grep \"Fatal error\"",
    920                  "/var/log/mindi.log");
     919        asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
    921920        asprintf(&tmp, call_program_and_get_last_line_of_output(command));
    922921        paranoid_free(command);
     
    17151714                log_to_screen("%s...OK", message_to_screen);
    17161715                if (!run_program_and_log_output
    1717                     ("tail -n10 /var/log/mondo-archive.log | fgrep \":-(\"",
     1716                    ("tail -n10 /var/log/mondo-archive.log | fgrep ':-('",
    17181717                     1)) {
    17191718                    log_to_screen
     
    17241723#ifdef DVDRWFORMAT
    17251724            asprintf(&tmp,
    1726                      "cat %s | tail -n8 | grep \"blank=full.*dvd-compat.*DAO\"",
     1725                     "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
    17271726                     MONDO_LOGFILE);
    17281727            if (g_backup_media_type == dvd
     
    31053104    } else {
    31063105        file_to_openin = biggie_filename;
    3107         asprintf(&command, "md5sum \"%s\"", biggie_filename);
     3106        asprintf(&command, "md5sum '%s'", biggie_filename);
    31083107        if (!(fin = popen(command, "r"))) {
    31093108            log_OS_error("Unable to popen-in command");
     
    35083507        if (bkpinfo->verify_data && !res) {
    35093508            log_to_screen
    3510                 ("Please reboot from the 1st CD in Compare Mode, as a precaution.");
     3509                ("Please reboot from the 1st %s in Compare Mode, as a precaution.",
     3510                 media_descriptor_string(g_backup_media_type));
    35113511            chdir("/");
    35123512            iamhere("Before calling verify_cd_image()");
     
    36403640*/
    36413641        asprintf(&tmp,
    3642                  "cat %s | grep \"afio: \" | sed 's/afio: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
     3642                 "sed -n -e 's/afio: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
    36433643                 MONDO_LOGFILE);
    36443644        system(tmp);
     
    36463646
    36473647        asprintf(&tmp,
    3648                  "cat %s | grep \"star: \" | sed 's/star: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
     3648                 "sed -n -e 's/star: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
    36493649                 MONDO_LOGFILE);
    36503650        system(tmp);
Note: See TracChangeset for help on using the changeset viewer.