Index: /branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
===================================================================
--- /branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (revision 909)
+++ /branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (revision 910)
@@ -400,5 +400,5 @@
 			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,5 +1399,5 @@
 			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,5 +1540,5 @@
 		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);
Index: /branches/stable/mondo/src/restore-scripts/mondo/compare-me
===================================================================
--- /branches/stable/mondo/src/restore-scripts/mondo/compare-me (revision 567)
+++ /branches/stable/mondo/src/restore-scripts/mondo/compare-me (revision 910)
@@ -261,5 +261,5 @@
 fi
 
-grep -v -x "Files [^:]*:-" /tmp/compare-me.log \
+grep -v -E '^Files [^:]*:-$' /tmp/compare-me.log \
 | sort -u > /tmp/suspect.files
 
Index: /branches/stable/mondo/src/mondoarchive/mondo-cli.c
===================================================================
--- /branches/stable/mondo/src/mondoarchive/mondo-cli.c (revision 809)
+++ /branches/stable/mondo/src/mondoarchive/mondo-cli.c (revision 910)
@@ -637,5 +637,5 @@
 			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,