Merge lp:~serge-hallyn/ubuntu/precise/pulseaudio/pa-upstart into lp:ubuntu/precise/pulseaudio

[Serge Hallyn]

This is an update of https://code.launchpad.net/~pali/ubuntu/precise/pulseaudio/pulseaudio/+merge/92622 to include a changelog entry.

[Chris Halse Rogers (raof)]

Is this change fixing a bug? We're quite a while past Feature Freeze, and unless it's likely to fix a bug, converting to an upstart job doesn't seem to be a valuable upload at this point in time.

If not, we could defer this to Q. Apart from the timing, it looks right.

review: Needs Information

[Serge Hallyn (serge-hallyn)]

Thanks. I don't think it's urgent, it was simply a continuation of https://code.launchpad.net/~pali/ubuntu/precise/pulseaudio/pulseaudio. The original author did not mention any bugs this fixes. Waiting until Q should be fine.

[Clint Byrum (clint-fewbar)]

Other feedback:

* This should probably use /run, not /var/run. I believe once we are in Q we should be able to do so without a versioned depends on sysvinit.

* mkdir, chown, chmod, can all be supplanted by install:

install -d -m755 -o pulse -g -pulse /run/pulse

Its part of coreutils and will always be available in runlevel 2.

* start on started udev and runlevel [2345] is wrong

as pulseaudio will be stopped, but not started again on a move from runlevel 1 to 2.

I recommend instead just using start on runlevel [2345], and then to make sure there is no race with udev (which starts so early, its pretty unlikely anyway), use wait-for-state in the pre-start:

start wait-for-state WAIT_FOR=udev WAITER=pulseaudio

review: Needs Fixing

[Steve Langasek (vorlon)]

> This should probably use /run, not /var/run.

/run requires a versioned dependency on initscripts, and is not worth doing for this cycle for anything that doesn't have to start in early boot.

> I recommend instead just using start on runlevel [2345], and then to
> make sure there is no race with udev (which starts so early, its
> pretty unlikely anyway)

There's no race here; we don't enter runlevel 2 until the network has had a chance to come up, and that doesn't happen until udev triggers it.

Unmerged revisions

169. By Serge Hallyn on 2012-03-02

[ Pali Rohár ]
Convert System V pulseaudio init script to upstart

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-29 11:03:32 +0000
+++ debian/changelog	2012-03-02 20:31:18 +0000
@@ -1,3 +1,10 @@
+pulseaudio (1:1.1-0ubuntu12) precise; urgency=low
+
+  [ Pali Rohár ]
+  * Convert System V pulseaudio init script to upstart
+
+ -- Serge Hallyn <[e-mail]>  Fri, 02 Mar 2012 14:27:29 -0600
+
 pulseaudio (1:1.1-0ubuntu11) precise; urgency=low
 
   * Cherry-pick a few crash-related patches from upstream git

=== added file 'debian/pulseaudio.upstart'
--- debian/pulseaudio.upstart	1970-01-01 00:00:00 +0000
+++ debian/pulseaudio.upstart	2012-03-02 20:31:18 +0000
@@ -0,0 +1,38 @@
+# System PulseAudio service
+
+description	"System PulseAudio sound server"
+author		"Pali Rohár <[e-mail]>"
+
+start on (started udev and runlevel [2345])
+stop on runlevel [016]
+
+expect daemon
+respawn
+
+env PULSEAUDIO_SYSTEM_START=0
+env DISALLOW_MODULE_LOADING=1
+env PULSEAUDIO_ARGS=
+
+pre-start script
+	[ -r /etc/default/pulseaudio ] && . /etc/default/pulseaudio
+	[ "$PULSEAUDIO_SYSTEM_START" != "1" ] && { stop; exit 0; }
+	mkdir -p /var/run/pulse
+	chown pulse:pulse /var/run/pulse
+	chmod 755 /var/run/pulse
+end script
+
+script
+	[ -r /etc/default/pulseaudio ] && . /etc/default/pulseaudio
+	exec /usr/bin/pulseaudio --system --daemonize --high-priority --log-target=syslog --disallow-exit --disallow-module-loading=$DISALLOW_MODULE_LOADING $PULSEAUDIO_ARGS
+end script
+
+post-start script
+	if [ -e /var/run/pulse/.esd_auth ]; then
+		chown pulse:pulse-access /var/run/pulse/.esd_auth
+		chmod 640 /var/run/pulse/.esd_auth
+	fi
+	if [ -e /var/run/pulse/.pulse-cookie ]; then
+		chown pulse:pulse-access /var/run/pulse/.pulse-cookie
+		chmod 640 /var/run/pulse/.pulse-cookie
+	fi
+end script