Changeset 932 in MondoRescue for trunk/mondo/src/common

Timestamp:

Nov 15, 2006, 12:40:15 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r913:931 $SVN_M/branches/stable

Location:

trunk/mondo/src/common

Files:

• libmondo-fifo.c (modified) (3 diffs)
• newt-specific.c (modified) (2 diffs)

trunk/mondo/src/common/libmondo-fifo.c

@@ -57 +57 @@
 
 extern char *ps_options;
+extern char *ps_proc_id;
 
 /**
@@ -151 +152 @@
 /**
  * Kill @c buffer processes.
+ * Only called in mondoarchive
  */
 void kill_buffer()
@@ -159 +161 @@
     sync();
     mr_asprintf(&command,
-            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
+            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options,
             g_sz_call_to_buffer);
     mr_free(g_sz_call_to_buffer);

trunk/mondo/src/common/newt-specific.c

@@ -35 +35 @@
 extern char *g_mondo_home;
 extern char *ps_options;
+    extern char *ps_proc_id;
 
 extern void set_signals(int);
@@ -244 +245 @@
     char *tmp = NULL;
 
-    mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
-run_program_and_log_output(tmp, TRUE);
+    mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str, ps_proc_id);
+    run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);
 }