Changeset 1294 in MondoRescue

Timestamp:

Apr 11, 2007, 7:06:14 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fix 2 references to grep -x which are not working during a restore process due to busybox limits of grep command (Fix for #96)

Location:

branches/2.2.2/mondo/src

Files:

• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)

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

@@ -349 +349 @@
 char *tmp = NULL;
 
-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);
+    asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"`", ps_options, str , ps_proc_id);
+    run_program_and_log_output(tmp, TRUE);
+    paranoid_free(tmp);
 }
 

branches/2.2.2/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -378 +378 @@
     if (length_of_file(logfile) > 5) {
         sprintf(command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
+                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> /tmp/changed.txt",
                 logfile);
         system(command);