Changeset 914 in MondoRescue for trunk/mondo/src/common/libmondo-verify.c

Timestamp:

Nov 2, 2006, 2:00:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r902:913 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-verify.c (modified) (3 diffs)

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

@@ -71 +71 @@
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
     mr_asprintf(&command,
-             "grep \"afio: \" %s | sed 's/afio: //' | grep -vx \"/dev/.*\" >> %s",
+             "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s",
              stderr_fname, afio_found_changes);
     log_msg(2, command);
@@ -82 +82 @@
     log_msg(1, "Now scanning log file for 'star: ' stuff");
     mr_asprintf(&command,
-             "grep \"star: \" %s | sed 's/star: //' | grep -vx \"/dev/.*\" >> %s",
+             "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s",
              stderr_fname, afio_found_changes);
     log_msg(2, command);
@@ -1072 +1072 @@
              (int) (random() % 32767));
     mr_asprintf(&tmp,
-             "grep -x \"%s:.*\" %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"dev/.*\"  > %s",
+             "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s",
              (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE,
              changed_files_fname);