------------------------------------------------------------
revno: 18
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Fri 2014-01-17 12:08:22 +0000
message:
  auto update
modified:
  etc/init/alsa-restore.conf
  etc/init/alsa-state.conf
  etc/init/alsa-store.conf
  etc/init/pollinate.conf


--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs

Your team Upstart Reviewers is subscribed to branch 
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to 
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init/alsa-restore.conf'
--- etc/init/alsa-restore.conf	2013-11-18 12:42:03 +0000
+++ etc/init/alsa-restore.conf	2014-01-17 12:08:22 +0000
@@ -7,12 +7,17 @@
 
 start on runlevel [2345]
 
+env ALSACTLHOME=/var/run/alsa
+
 task
 
 pre-start script
+    if ! test -d $ALSACTLHOME ; then
+        mkdir -p $ALSACTLHOME
+    fi
     if test -f /var/lib/alsa/state-daemon.conf ; then
         stop; exit 0
     fi
 end script
 
-exec /usr/sbin/alsactl restore
+exec /usr/sbin/alsactl -E HOME="$ALSACTLHOME" restore

=== modified file 'etc/init/alsa-state.conf'
--- etc/init/alsa-state.conf	2013-11-18 12:42:03 +0000
+++ etc/init/alsa-state.conf	2014-01-17 12:08:22 +0000
@@ -7,16 +7,21 @@
 
 start on runlevel [2345]
 
+env ALSACTLHOME=/var/run/alsa
+
 expect fork
 
 pre-start script
+    if ! test -d $ALSACTLHOME ; then
+        mkdir -p $ALSACTLHOME
+    fi
     if ! test -f /var/lib/alsa/state-daemon.conf ; then
         stop; exit 0
     fi
 end script
 
-exec /usr/sbin/alsactl -s -n 19 -b -c rdaemon
+exec /usr/sbin/alsactl -E HOME="$ALSACTLHOME" -s -n 19 -b -c rdaemon
 
 pre-stop script
-    /usr/sbin/alsactl -s kill save_and_quit
+    /usr/sbin/alsactl -E HOME="$ALSACTLHOME" -s kill save_and_quit
 end script

=== modified file 'etc/init/alsa-store.conf'
--- etc/init/alsa-store.conf	2013-11-18 12:42:03 +0000
+++ etc/init/alsa-store.conf	2014-01-17 12:08:22 +0000
@@ -7,12 +7,17 @@
 	
 start on runlevel [!2345]
 
+env ALSACTLHOME=/var/run/alsa
+
 task
 
 pre-start script
+    if ! test -d $ALSACTLHOME ; then
+        mkdir -p $ALSACTLHOME
+    fi
     if test -f /var/lib/alsa/state-daemon.conf ; then
         stop; exit 0
     fi
 end script
 
-exec /usr/sbin/alsactl store
+exec /usr/sbin/alsactl -E HOME="$ALSACTLHOME" store

=== modified file 'etc/init/pollinate.conf'
--- etc/init/pollinate.conf	2014-01-16 12:08:34 +0000
+++ etc/init/pollinate.conf	2014-01-17 12:08:22 +0000
@@ -3,7 +3,7 @@
 description	"Entropy-as-a-Service client"
 author		"Dustin Kirkland <[email protected]>"
 
-setuid daemon
+setuid root
 
 start on (started networking or starting ssh)
 

-- 
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/upstart-devel

Reply via email to