Changeset 932 in MondoRescue for trunk/mondo
- Timestamp:
- Nov 15, 2006, 12:40:15 PM (17 years ago)
- Location:
- trunk/mondo
- Files:
-
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/configure.in
r904 r932 18 18 AC_ARG_PROGRAM 19 19 20 AM_INIT_AUTOMAKE([ src], MONDO_VER)20 AM_INIT_AUTOMAKE([mondo], MONDO_VER) 21 21 AM_MAINTAINER_MODE 22 22 -
trunk/mondo/src/common/libmondo-fifo.c
r900 r932 57 57 58 58 extern char *ps_options; 59 extern char *ps_proc_id; 59 60 60 61 /** … … 151 152 /** 152 153 * Kill @c buffer processes. 154 * Only called in mondoarchive 153 155 */ 154 156 void kill_buffer() … … 159 161 sync(); 160 162 mr_asprintf(&command, 161 "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $ 1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,163 "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, 162 164 g_sz_call_to_buffer); 163 165 mr_free(g_sz_call_to_buffer); -
trunk/mondo/src/common/newt-specific.c
r900 r932 35 35 extern char *g_mondo_home; 36 36 extern char *ps_options; 37 extern char *ps_proc_id; 37 38 38 39 extern void set_signals(int); … … 244 245 char *tmp = NULL; 245 246 246 mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);247 run_program_and_log_output(tmp, TRUE);247 mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str, ps_proc_id); 248 run_program_and_log_output(tmp, TRUE); 248 249 mr_free(tmp); 249 250 } -
trunk/mondo/src/mondoarchive/main.c
r900 r932 42 42 long diffs; 43 43 char *ps_options = "auxww"; 44 char *ps_proc_id = "$2"; 44 45 45 46 extern int g_loglevel; -
trunk/mondo/src/mondorestore/mondo-restore.c
r914 r932 124 124 char *g_mondo_home = NULL; 125 125 126 /* Busybox ps has no option and PID in first pos */ 126 127 char *ps_options = ""; 128 char *ps_proc_id = "$1"; 127 129 128 130 /* @} - end of "Restore-Time Globals" in globalGroup */
Note:
See TracChangeset
for help on using the changeset viewer.