Changeset 928 in MondoRescue

Timestamp:

Nov 13, 2006, 10:17:07 AM (18 years ago)

Author:

Bruno Cornec

Message:

ps (busybox) and ps (system) do not give PID in the same column. Adapted with a global variable.

Location:

branches/stable/mondo/src

Files:

• common/libmondo-fifo.c (modified) (3 diffs)
• common/newt-specific.c (modified) (2 diffs)
• mondoarchive/main.c (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-fifo.c

@@ -137 +137 @@
 
 extern char *ps_options;
+extern char *ps_proc_id;
 
 /**
@@ -233 +234 @@
 /**
  * Kill @c buffer processes.
+ * Only called in mondoarchive
  */
 void kill_buffer()
@@ -243 +245 @@
     paranoid_system("sync");
     sprintf(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);
     log_msg(2, "kill_buffer() --- command = %s", command);

branches/stable/mondo/src/common/newt-specific.c

@@ -129 +129 @@
     extern char *g_mondo_home;
     extern char *ps_options;
+    extern char *ps_proc_id;
 
     extern void set_signals(int);
@@ -348 +349 @@
 char *tmp = NULL;
 
-asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
+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);
 paranoid_free(tmp);

branches/stable/mondo/src/mondoarchive/main.c

@@ -141 +141 @@
 long diffs;
 char *ps_options = "auxww";
+char *ps_proc_id = "$2";
 
 extern t_bkptype g_backup_media_type;

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -489 +489 @@
 char *g_mondo_home;
 
+/* Busybox ps has no option and PID in first pos */
 char *ps_options = "";
+char *ps_proc_id = "$1";
 
 /* @} - end of "Restore-Time Globals" in globalGroup */