Merge lp:~cjwatson/alsa-utils/mountall-deadlock into lp:~ubuntu-audio-dev/alsa-utils/ubuntu.natty

[Colin Watson]

I've uploaded this to natty, because the previous code deadlocks the boot process on systems with separate /usr and /var. The changelog should explain all:

  * Remove '(mounted MOUNTPOINT=/usr) and (mounted MOUNTPOINT=/var)' from
    /etc/init/alsa-restore.conf's 'start on' condition. Not only is this
    redundant, because runlevel [2345] already implies that /usr and /var
    have been mounted, but it deadlocks mountall in the event of /usr and
    /var both being separate filesystems (LP: #723482).

Please merge.

=== modified file 'debian/alsa-restore.upstart'
--- debian/alsa-restore.upstart	2011-02-21 07:04:05 +0000
+++ debian/alsa-restore.upstart	2011-03-02 00:51:17 +0000
@@ -5,7 +5,7 @@
 
 description	"restore sound card(s') mixer state(s)"
 
-start on runlevel [2345] and (mounted MOUNTPOINT=/usr) and (mounted MOUNTPOINT=/var)
+start on runlevel [2345]
 
 task
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-22 04:56:58 +0000
+++ debian/changelog	2011-03-02 00:51:17 +0000
@@ -1,3 +1,13 @@
+alsa-utils (1.0.24.2-0ubuntu2) natty; urgency=low
+
+  * Remove '(mounted MOUNTPOINT=/usr) and (mounted MOUNTPOINT=/var)' from
+    /etc/init/alsa-restore.conf's 'start on' condition.  Not only is this
+    redundant, because runlevel [2345] already implies that /usr and /var
+    have been mounted, but it deadlocks mountall in the event of /usr and
+    /var both being separate filesystems (LP: #723482).
+
+ -- Colin Watson <[e-mail]>  Wed, 02 Mar 2011 00:43:01 +0000
+
 alsa-utils (1.0.24.2-0ubuntu1) natty; urgency=low
 
   [ David Henningsson ]