Changeset 1294


Ignore:
Timestamp:
Apr 11, 2007, 7:06:14 PM (12 years ago)
Author:
bruno
Message:

Fix 2 references to grep -x which are not working during a restore process due to busybox limits of grep command (Fix for #96)

Location:
branches/2.2.2/mondo/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.2/mondo/src/common/newt-specific.c

    r1274 r1294  
    349349char *tmp = NULL;
    350350
    351 asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str , ps_proc_id);
    352 run_program_and_log_output(tmp, TRUE);
    353 paranoid_free(tmp);
     351    asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"`", ps_options, str , ps_proc_id);
     352    run_program_and_log_output(tmp, TRUE);
     353    paranoid_free(tmp);
    354354}
    355355
  • branches/2.2.2/mondo/src/mondorestore/mondo-rstr-compare.c

    r998 r1294  
    378378    if (length_of_file(logfile) > 5) {
    379379        sprintf(command,
    380                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
     380                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> /tmp/changed.txt",
    381381                logfile);
    382382        system(command);
Note: See TracChangeset for help on using the changeset viewer.