diff -Nru mountall-2.15.2/debian/changelog mountall-2.15.3/debian/changelog
--- mountall-2.15.2/debian/changelog	2010-09-02 00:31:10.000000000 +0200
+++ mountall-2.15.3/debian/changelog	2010-10-04 15:35:37.000000000 +0200
@@ -1,3 +1,10 @@
+mountall (2.15.3) lucid-updates; urgency=low
+
+  * Do not wait for /var/opt/* filesystems.
+  * Honor nobootwait option for /var/* and /usr/* filesystems.
+
+ -- Raphael Pinson <raphink@ubuntu.com>  Mon, 04 Oct 2010 13:35:38 +0200
+
 mountall (2.15.2) lucid-security; urgency=low
 
   * SECURITY UPDATE: do not leave writable udev rules file around.
diff -Nru mountall-2.15.2/src/mountall.c mountall-2.15.3/src/mountall.c
--- mountall-2.15.2/src/mountall.c	2010-09-02 00:31:55.000000000 +0200
+++ mountall-2.15.3/src/mountall.c	2010-10-04 15:31:42.000000000 +0200
@@ -1208,10 +1208,14 @@
 			nih_debug ("%s is root filesystem", MOUNT_NAME (mnt));
 			tag = TAG_LOCAL;
 		} else if (is_remote (mnt)) {
-			if ((! strcmp (mnt->mountpoint, "/usr"))
+			if (
+			    (((! strcmp (mnt->mountpoint, "/usr"))
 			    || (! strcmp (mnt->mountpoint, "/var"))
 			    || (! strncmp (mnt->mountpoint, "/usr/", 5))
-			    || (! strncmp (mnt->mountpoint, "/var/", 5))
+			    || (! strncmp (mnt->mountpoint, "/var/", 5)))
+			    && (! has_option (mnt, "nobootwait", FALSE))
+			    && (strcmp (mnt->mountpoint, "/var/opt"))
+			    && (strncmp (mnt->mountpoint, "/var/opt/", 9)))
 			    || (has_option (mnt, "bootwait", FALSE)))
 			{
 				tag = TAG_REMOTE;