  
  /**
   * plymouth_error:
-@@ -1475,7 +1485,8 @@
+@@ -1208,11 +1218,12 @@
+ 			nih_debug ("%s is root filesystem", MOUNT_NAME (mnt));
+ 			tag = TAG_LOCAL;
+ 		} else if (is_remote (mnt)) {
+-			if ((! strcmp (mnt->mountpoint, "/usr"))
++			if ((! has_option (mnt, "nobootwait", FALSE)) && (
++                            (! strcmp (mnt->mountpoint, "/usr"))
+ 			    || (! strcmp (mnt->mountpoint, "/var"))
+ 			    || (! strncmp (mnt->mountpoint, "/usr/", 5))
+ 			    || (! strncmp (mnt->mountpoint, "/var/", 5))
+-			    || (has_option (mnt, "bootwait", FALSE)))
++			    || (has_option (mnt, "bootwait", FALSE))))
+ 			{
+ 				tag = TAG_REMOTE;
+ 			} else {
+@@ -1475,7 +1486,8 @@
  	/* Enforce local only after virtual filesystems triggered */
  	if ((! local_triggered)
  	    && virtual_triggered

 
diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
--- mountall-2.15-orig/src/mountall.c	2010-05-09 01:42:24.000000000 +0200
+++ mountall-2.15/src/mountall.c	2010-06-07 13:04:19.000000000 +0200
@@ -64,8 +64,10 @@
 #include <nih-dbus/dbus_proxy.h>
 #include <nih-dbus/errors.h>

 void
 plymouth_response (void *             user_data,
 		   ply_boot_client_t *client)
@@ -3125,7 +3164,7 @@
 		break;
 	}
 }
