The patch.

diff -urd util-linux-2.19.1/mount/mount.c util-linux-2.19.1.mine/mount/mount.c
--- util-linux-2.19.1/mount/mount.c	2011-10-12 21:14:38.000000000 +0200
+++ util-linux-2.19.1.mine/mount/mount.c	2011-10-12 21:04:21.928021597 +0200
@@ -2135,7 +2136,7 @@
 		if (has_noauto (mc->m.mnt_opts))
 			continue;
 		if (matching_type (mc->m.mnt_type, types)
-		    && matching_opts (mc->m.mnt_opts, test_opts)
+		    && matching_opts (mc->m.mnt_opts ? mc->m.mnt_opts : "defaults", test_opts)
 		    && !streq (mc->m.mnt_dir, "/")
 		    && !streq (mc->m.mnt_dir, "root")
 		    && !is_fstab_entry_mounted(mc, verbose)) {
diff -urd util-linux-2.19.1/mount/sundries.c util-linux-2.19.1.mine/mount/sundries.c
--- util-linux-2.19.1/mount/sundries.c	2011-03-04 12:47:44.000000000 +0100
+++ util-linux-2.19.1.mine/mount/sundries.c	2011-10-12 21:06:44.990968714 +0200
@@ -217,6 +217,12 @@
 
      if (test_opts == NULL)
 	  return 1;
+     
+     if(options == NULL)
+     {
+	error(_("Invalid options set while testing against %s"), test_opts);
+	return 0;
+     }
 
      len = strlen(test_opts);
      q = alloca(len+1);

Reply via email to