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

Since everything is in a single event loop, a request from plymouth to

skip a mount may come in after the mount has already happened.  So don't
assert on a bogus request, just treat it as a no-op and continue.
LP: #731800.
parent e275d206
......@@ -13,6 +13,10 @@ mountall (2.50) UNRELEASED; urgency=low
* Support reading --verbose/--debug options from /proc/cmdline, so that
we can give users a better way to debug mountall without having to
edit the upstart job.
* Since everything is in a single event loop, a request from plymouth to
skip a mount may come in after the mount has already happened. So don't
assert on a bogus request, just treat it as a no-op and continue.
LP: #731800.
-- Steve Langasek <vorlon@debian.org> Sun, 08 Sep 2013 23:12:35 -0700
......
......@@ -1544,7 +1544,8 @@ void
skip_mount (Mount *mnt)
{
nih_assert (mnt != NULL);
nih_assert ((! mnt->mounted) || needs_remount (mnt));
if (mnt->mounted && ! needs_remount (mnt))
return;
nih_debug ("%s", MOUNT_NAME (mnt));
......
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