Merge lp:~pali/ubuntu/oneiric/pulseaudio/pulseaudio into lp:ubuntu/oneiric/pulseaudio

[Pali]

* Convert System V pulseaudio init script to upstart
* Added support for additional pulseaudio command line arguments in upstart

[Scott Moser (smoser)]

I built your branch, but it failed to install. The issue was the way you are 'stop'ing in the upstart script.
exiting in a 'script' section will cause upstart to try to respawn the job. Eventually that will hit the respawn limit.

So, the changes I suggest are:
 * fix the issue of 'start' with a pre-start script (you can see a similar example in the libvirt-bin package).
 * you should also probably do the 'mkdir -p /var/run/pulse' in pre-start.
 * Also, if you use dh_installinit, you can actually leave the old .init file around, and do not have to modify debian/pulseaudio.install as dh_installinit will do that for you.
   - mkdir -p $(CURDIR)/debian/tmp/etc/init
   - cp -a $(CURDIR)/debian/pulseaudio.upstart $(CURDIR)/debian/tmp/etc/init/pulseaudio.conf
   + dh_installinit
 * re-add the pulseaudio.init
   bzr revert -r 143 debian/pulseaudio.init
   bzr add debian/pulseaudio.init

review: Needs Fixing

[Chris Halse Rogers (raof)]

I'm marking this as “In Progress” to drop it off the sponsorship queue.

Once you've addressed the review above, please set the status back to “Needs Review” and it will go back onto the sponsorship queue.

[Pali (pali)]

Here is new merge request:
https://code.launchpad.net/~pali/ubuntu/precise/pulseaudio/pulseaudio/+merge/92622

I tried to "resubmit proposal" button, but launchpad does not worked.

review: Needs Resubmitting

[Evan Broder (broder)]

Pali - currently both merge proposals are marked as "Needs Review", which causes them both to show up on the sponsorship queue. Could you please change this one back to "Work In Progress"?

(I would do it, but am blocked by bug #612391)

[Pali (pali)]

changed back to work in progress. maybe this merge request could be closed or marked as superseded (but I do not know how).

Unmerged revisions

145. By Pali on 2011-07-08

Added support for additional pulseaudio command line arguments in upstart

144. By Pali on 2011-07-08

Convert System V pulseaudio init script to upstart

=== modified file 'debian/pulseaudio.default'
--- debian/pulseaudio.default	2011-05-27 14:05:01 +0000
+++ debian/pulseaudio.default	2011-07-08 07:51:29 +0000
@@ -20,3 +20,5 @@
 # 0 = no, 1 = yes
 DISALLOW_MODULE_LOADING=1
 
+# Additional pulseaudio command line arguments
+# PULSEAUDIO_ARGS="--disallow-exit=1"

=== removed file 'debian/pulseaudio.init'
--- debian/pulseaudio.init	2010-03-10 18:53:51 +0000
+++ debian/pulseaudio.init	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          pulseaudio esound
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Should-Start:      udev NetworkManager
-# Should-Stop:       udev NetworkManager
-# Default-Start:     2 3 4 5
-# Default-Stop:      1
-# Short-Description: Start the PulseAudio sound server
-# Description:       System mode startup script for
-#                    the PulseAudio sound server.
-### END INIT INFO
-
-DAEMON=/usr/bin/pulseaudio
-PIDDIR=/var/run/pulse
-PIDFILE=$PIDDIR/pid 
-DAEMONUSER=pulse
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-PULSEAUDIO_SYSTEM_START=0
-DISALLOW_MODULE_LOADING=1
-test -f /etc/default/pulseaudio && . /etc/default/pulseaudio
-if [ "$PULSEAUDIO_SYSTEM_START" != "1" ]; then
-	log_warning_msg "PulseAudio configured for per-user sessions"
-	exit 0
-fi
-
-pulseaudio_start () {
-	log_daemon_msg "Starting system PulseAudio Daemon"
-	if [ ! -d $PIDDIR ]; then
-		mkdir -p $PIDDIR
-		chown $DAEMONUSER:$DAEMONUSER $PIDDIR
-	fi
-	start-stop-daemon -x $DAEMON -p $PIDFILE --start -- --system --daemonize --high-priority --log-target=syslog --disallow-module-loading=$DISALLOW_MODULE_LOADING
-	status=$?
-	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
-	log_end_msg ${status}
-}
-
-pulseaudio_stop () {
-	log_daemon_msg "Stopping system PulseAudio Daemon"
-	start-stop-daemon -p $PIDFILE --stop --retry 5 || echo -n "...which is not running"
-	log_end_msg $?
-}
-
-case "$1" in
-	start|stop)
-		pulseaudio_${1}
-		;;
-	restart|reload|force-reload)
-		if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
-			pulseaudio_stop
-			pulseaudio_start
-		fi
-		;;
-	force-stop)
-		pulseaudio_stop
-		killall pulseaudio || true
-		sleep 2
-		killall -9 pulseaudio || true
-		;;
-	status)
-		status_of_proc -p $PIDFILE "$DAEMON" "system-wide PulseAudio" && exit 0 || exit $?
-		;;
-	*)
-		echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|reload|force-reload|status}"
-		exit 1
-		;;
-esac
-
-exit 0

=== modified file 'debian/pulseaudio.install'
--- debian/pulseaudio.install	2011-05-27 14:05:01 +0000
+++ debian/pulseaudio.install	2011-07-08 07:51:29 +0000
@@ -1,3 +1,4 @@
+etc/init/pulseaudio.conf
 etc/pulse/default.pa
 etc/pulse/system.pa
 etc/pulse/daemon.conf

=== added file 'debian/pulseaudio.upstart'
--- debian/pulseaudio.upstart	1970-01-01 00:00:00 +0000
+++ debian/pulseaudio.upstart	2011-07-08 07:51:29 +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]
+
+respawn
+
+env PULSEAUDIO_SYSTEM_START=0
+env DISALLOW_MODULE_LOADING=1
+env PULSEAUDIO_ARGS=
+
+script
+	if [ -f /etc/default/pulseaudio ]; then
+		. /etc/default/pulseaudio
+	fi
+	if [ "$PULSEAUDIO_SYSTEM_START" != "1" ]; then
+		exit 0
+	fi
+	if [ ! -d /var/run/pulse ]; then
+		mkdir -p /var/run/pulse
+		chown pulse:pulse /var/run/pulse
+	fi
+	exec /usr/bin/pulseaudio --system --high-priority --log-target=syslog --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

=== modified file 'debian/rules'
--- debian/rules	2011-06-24 10:18:17 +0000
+++ debian/rules	2011-07-08 07:51:29 +0000
@@ -20,6 +20,8 @@
 	cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa
 	cp -a $(CURDIR)/debian/*.conf $(CURDIR)/debian/tmp/usr/share/alsa
+	mkdir -p $(CURDIR)/debian/tmp/etc/init
+	cp -a $(CURDIR)/debian/pulseaudio.upstart $(CURDIR)/debian/tmp/etc/init/pulseaudio.conf
 	install -D -m755 $(CURDIR)/debian/01PulseAudio $(CURDIR)/debian/tmp/usr/lib/pm-utils/sleep.d/01PulseAudio
 	install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
 	cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py