Changeset 910 in MondoRescue

Timestamp:

Nov 1, 2006, 6:22:57 PM (18 years ago)

Author:

Bruno Cornec

Message:

replaces grep -x by grep -E during restore as busybox doesn't provide -x either

Location:

branches/stable/mondo/src

Files:

• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• restore-scripts/mondo/compare-me (modified) (1 diff)

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -637 +637 @@
             strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
         }
-        sprintf(tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
+        sprintf(tmp, "mount | grep -E \"^%s .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
         strncpy(bkpinfo->isodir,

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -400 +400 @@
             f, file);
     log_msg(2, tmp);
-    sprintf(command, "grep -x \"%s\" %s", file, list_fname);
+    sprintf(command, "grep -E '^%s$' %s", file, list_fname);
     res = run_program_and_log_output(command, FALSE);
     paranoid_free(command);
@@ -1399 +1399 @@
             paranoid_system(command);
         }
-        sprintf(command, "grep  -x \"/dev/.*\" %s > %s",
+        sprintf(command, "grep -E '^/dev/.*' %s > %s",
                 g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
@@ -1540 +1540 @@
         res = run_program_and_log_output(tmp, FALSE);
     } else {
-        sprintf(tmp, "ls /dev | grep -xq %ss[1-4].*", device);
+        sprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             sprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);

branches/stable/mondo/src/restore-scripts/mondo/compare-me

@@ -261 +261 @@
 fi
 
-grep -v -x "Files [^:]*:-" /tmp/compare-me.log \
+grep -v -E '^Files [^:]*:-$' /tmp/compare-me.log \
 | sort -u > /tmp/suspect.files