Changeset 1293


Ignore:
Timestamp:
Apr 11, 2007, 7:03:48 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/stable/mondo/src
Files:
2 edited

Legend:

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

    r1264 r1293  
    256256    char *tmp = NULL;
    257257
    258     mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str, ps_proc_id);
     258    mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"`", ps_options, str, ps_proc_id);
    259259    run_program_and_log_output(tmp, TRUE);
    260260    mr_free(tmp);
  • branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

    r1200 r1293  
    297297    if (length_of_file(logfile) > 5) {
    298298        mr_asprintf(&command,
    299                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
     299                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> /tmp/changed.txt",
    300300                logfile);
    301301        system(command);
Note: See TracChangeset for help on using the changeset viewer.