Ignore:
Timestamp:
Sep 14, 2006, 1:05:18 AM (13 years ago)
Author:
bruno
Message:

merge -r781:793 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r783 r794  
    369369    char *command;
    370370    asprintf(&command,
    371             "kill `ps wax 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
     371            "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
    372372    paranoid_system(command);
    373373    paranoid_free(command);
     
    19851985         &&
    19861986         run_program_and_log_output
    1987          ("ps wax | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
     1987         ("ps | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
    19881988         i++) {
    19891989        sleep(1);
Note: See TracChangeset for help on using the changeset viewer.