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

[Serge Hallyn]

This is an update of the following review:

https://code.launchpad.net/~serge-hallyn/ubuntu/precise/pulseaudio/pa-upstart/+merge/95664

which in turn was an update of

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

Previous review comments have been addressed, thanks for your input.

[Serge Hallyn (serge-hallyn)]

The upstartification has been merged. This branch is obsolete.

review: Disapprove

[lp:~serge-hallyn/ubuntu/quantal/pulseaudio/pa-upstart]

175. By Serge Hallyn on 2012-07-20

* deprecate pulseaudio.default. Move it's helpful comments into the upstart
  script.
* pulseaudio.upstart:
  - replace mkdir/chmod/chown by install
  - remove PULSEAUDIO_SYSTEM_START=0, and instead comment out the 'start on'
    with a comment explaining how to re-enable
  - remove started udev from start on - it's redundant with runlevel 2, and
    would fail in the case of switching to runlevel 1 and back to 2.

176. By Serge Hallyn on 2012-07-20

don't gratuitously use a 'script' section just to do one exec.

177. By Serge Hallyn on 2012-07-20

per SpamapS, make pre-start a one-liner exec.

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-08 15:51:39 +0000
+++ debian/changelog	2012-07-20 21:41:20 +0000
@@ -1,3 +1,16 @@
+pulseaudio (1:2.0-0ubuntu2) quantal; urgency=low
+
+  * deprecate pulseaudio.default.  Move it's helpful comments into the upstart
+    script.
+  * pulseaudio.upstart:
+    - replace mkdir/chmod/chown by install
+    - remove PULSEAUDIO_SYSTEM_START=0, and instead comment out the 'start on'
+      with a comment explaining how to re-enable
+    - remove started udev from start on - it's redundant with runlevel 2, and
+      would fail in the case of switching to runlevel 1 and back to 2.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 20 Jul 2012 12:30:47 -0500
+
 pulseaudio (1:2.0-0ubuntu1) quantal; urgency=low
 
   [ Luke Yelavich ]

=== modified file 'debian/pulseaudio.default'
--- debian/pulseaudio.default	2011-05-27 14:05:01 +0000
+++ debian/pulseaudio.default	2012-07-20 21:41:20 +0000
@@ -1,22 +1,1 @@
-# Start the PulseAudio sound server in system mode.
-# (enables the pulseaudio init script - requires that users be in the
-# pulse-access group)
-# System mode is not the recommended way to run PulseAudio as it has some
-# limitations (such as no shared memory access) and could potentially allow
-# users to disconnect or redirect each others' audio streams. The
-# recommended way to run PulseAudio is as a per-session daemon. For GNOME/KDE/
-# Xfce sessions in Ubuntu Lucid/10.04, /etc/xdg/autostart/pulseaudio.desktop
-# handles this function of automatically starting PulseAudio on login, and for
-# it to work correctly your user must *not* have "autospawn = no" set in
-# ~/.pulse/client.conf (or in /etc/pulse/client.conf). By default, autospawn
-# is enabled. For other sessions, you can simply start PulseAudio with
-# "pulseaudio --daemonize".
-# 0 = don't start in system mode, 1 = start in system mode
-PULSEAUDIO_SYSTEM_START=0
-
-# Prevent users from dynamically loading modules into the PulseAudio sound
-# server. Dynamic module loading enhances the flexibility of the PulseAudio
-# system, but may pose a security risk.
-# 0 = no, 1 = yes
-DISALLOW_MODULE_LOADING=1
-
+# This file is deprecated please edit /etc/init/pulseaudio.conf

=== modified file 'debian/pulseaudio.upstart'
--- debian/pulseaudio.upstart	2012-06-08 15:51:39 +0000
+++ debian/pulseaudio.upstart	2012-07-20 21:41:20 +0000
@@ -3,28 +3,38 @@
 description	"System PulseAudio sound server"
 author		"Pali Rohár <[e-mail]>"
 
-start on (started udev and runlevel [2345])
+# uncomment the 'start on' to start pulseaudio in system mode
+# (enables the pulseaudio init script - requires that users be in the
+# pulse-access group)
+# System mode is not the recommended way to run PulseAudio as it has some
+# limitations (such as no shared memory access) and could potentially allow
+# users to disconnect or redirect each others' audio streams. The
+# recommended way to run PulseAudio is as a per-session daemon. For GNOME/KDE/
+# Xfce sessions in Ubuntu Lucid/10.04, /etc/xdg/autostart/pulseaudio.desktop
+# handles this function of automatically starting PulseAudio on login, and for
+# it to work correctly your user must *not* have "autospawn = no" set in
+# ~/.pulse/client.conf (or in /etc/pulse/client.conf). By default, autospawn
+# is enabled. For other sessions, you can simply start PulseAudio with
+# "pulseaudio --daemonize".
+
+#start on runlevel [2345]
 stop on runlevel [016]
 
 expect daemon
 respawn
 
-env PULSEAUDIO_SYSTEM_START=0
+# Prevent users from dynamically loading modules into the PulseAudio sound
+# server. Dynamic module loading enhances the flexibility of the PulseAudio
+# system, but may pose a security risk.
+# 0 = no, 1 = yes
 env DISALLOW_MODULE_LOADING=1
+
+# extra arguments to pass to the daemon
 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
+pre-start exec install -d -m755 -o pulse -g pulse /run/pulse
 
-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
+exec /usr/bin/pulseaudio --system --daemonize --high-priority --log-target=syslog --disallow-exit --disallow-module-loading=$DISALLOW_MODULE_LOADING $PULSEAUDIO_ARGS
 
 post-start script
 	if [ -e /var/run/pulse/.esd_auth ]; then