Commit a8272740 authored by Steve Langasek's avatar Steve Langasek
Browse files

Honor nobootwait option for /var/* and /usr/* remote filesystems.

LP: #654545
parent 39b78aa4
...@@ -8,6 +8,10 @@ mountall (2.37) UNRELEASED; urgency=low ...@@ -8,6 +8,10 @@ mountall (2.37) UNRELEASED; urgency=low
* Replace build flag handling in debian/rules with debhelper compat 9 and * Replace build flag handling in debian/rules with debhelper compat 9 and
dpkg-buildflags. dpkg-buildflags.
[ Raphaël Pinson ]
* Honor nobootwait option for /var/* and /usr/* remote filesystems.
LP: #654545
-- Steve Langasek <vorlon@debian.org> Fri, 18 May 2012 22:38:55 -0700 -- Steve Langasek <vorlon@debian.org> Fri, 18 May 2012 22:38:55 -0700
mountall (2.36) precise; urgency=low mountall (2.36) precise; urgency=low
......
...@@ -1291,11 +1291,12 @@ tag_mount (Mount *mnt, ...@@ -1291,11 +1291,12 @@ tag_mount (Mount *mnt,
nih_debug ("%s is root filesystem", MOUNT_NAME (mnt)); nih_debug ("%s is root filesystem", MOUNT_NAME (mnt));
tag = TAG_LOCAL; tag = TAG_LOCAL;
} else if (is_remote (mnt)) { } else if (is_remote (mnt)) {
if ((! strcmp (mnt->mountpoint, "/usr")) if (((! strcmp (mnt->mountpoint, "/usr"))
|| (! strcmp (mnt->mountpoint, "/var")) || (! strcmp (mnt->mountpoint, "/var"))
|| (! strncmp (mnt->mountpoint, "/usr/", 5)) || (! strncmp (mnt->mountpoint, "/usr/", 5))
|| (! strncmp (mnt->mountpoint, "/var/", 5)) || (! strncmp (mnt->mountpoint, "/var/", 5))
|| (has_option (mnt, "bootwait", FALSE))) || (has_option (mnt, "bootwait", FALSE)))
&& ! has_option (mnt, "nobootwait", FALSE))
{ {
tag = TAG_REMOTE; tag = TAG_REMOTE;
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment