Changeset 794 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

Sep 14, 2006, 1:05:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r781:793 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/mondorestore

Files:

• mondo-restore.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (2 diffs)

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -122 +122 @@
  */
 char *g_mondo_home = NULL;
+
+char *ps_options = "";
 
 /* @} - end of "Restore-Time Globals" in globalGroup */

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -369 +369 @@
     char *command;
     asprintf(&command,
-            "kill `ps wax 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
+            "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
     paranoid_system(command);
     paranoid_free(command);
@@ -1985 +1985 @@
          &&
          run_program_and_log_output
-         ("ps wax | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
+         ("ps | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
          i++) {
         sleep(1);