------------------------------------------------------------ revno: 54 committer: Dimitri John Ledkov <[email protected]> branch nick: upstart-jobs timestamp: Sat 2014-04-05 12:07:46 +0100 message: auto update added: etc/init/cgmanager.override etc/init/cgproxy.override modified: etc/init/cgmanager.conf etc/init/cgproxy.conf etc/init/lxc-android-config.conf usr/share/upstart/sessions/ubuntu-push-client.conf usr/share/upstart/sessions/url-dispatcher-refresh.conf usr/share/upstart/sessions/url-dispatcher-update.conf usr/share/upstart/sessions/url-dispatcher.conf usr/share/upstart/sessions/usensord.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/cgmanager.conf' --- etc/init/cgmanager.conf 2014-03-31 11:07:46 +0000 +++ etc/init/cgmanager.conf 2014-04-05 11:07:46 +0000 @@ -2,6 +2,7 @@ author "Serge Hallyn <[email protected]>" respawn +expect stop # in trusty /sys/fs/cgroup will be mounted for us. # prior to saucy, we would need to start on mounted @@ -18,6 +19,10 @@ env cgm_extra_mounts="-m name=systemd" pre-start script + # Kill any existing cgproxy. This is required to allow proper + # respawning of cgmanager. + stop cgproxy >/dev/null 2>&1 || true + # check whether we should start a cgproxy or a cgmanager if cgproxy --check-master; then start cgproxy NESTED=yes || true && { stop; exit 0; } @@ -27,5 +32,5 @@ script [ -r /etc/default/cgmanager ] && . /etc/default/cgmanager - exec /sbin/cgmanager $cgmanager_opts $cgm_extra_mounts + exec /sbin/cgmanager --sigstop $cgmanager_opts $cgm_extra_mounts end script === added file 'etc/init/cgmanager.override' --- etc/init/cgmanager.override 1970-01-01 00:00:00 +0000 +++ etc/init/cgmanager.override 2014-04-05 11:07:46 +0000 @@ -0,0 +1,1 @@ +manual === modified file 'etc/init/cgproxy.conf' --- etc/init/cgproxy.conf 2014-03-31 11:07:46 +0000 +++ etc/init/cgproxy.conf 2014-04-05 11:07:46 +0000 @@ -2,6 +2,8 @@ author "Serge Hallyn <[email protected]>" respawn +expect stop +emits cgmanager-ready # in trusty /sys/fs/cgroup will be mounted for us. # prior to saucy, we would need to start on mounted @@ -16,6 +18,7 @@ pre-start script # check whether we should start if [ -e /proc/self/ns/pid ] && [ "$NESTED" = "no" ]; then + initctl emit -n cgmanager-ready { stop; exit 0; } fi end script @@ -23,5 +26,7 @@ script [ -r /etc/default/cgmanager ] && . /etc/default/cgmanager - exec /sbin/cgproxy $cgmanager_opts + exec /sbin/cgproxy --sigstop $cgmanager_opts end script + +post-start exec initctl emit -n cgmanager-ready === added file 'etc/init/cgproxy.override' --- etc/init/cgproxy.override 1970-01-01 00:00:00 +0000 +++ etc/init/cgproxy.override 2014-04-05 11:07:46 +0000 @@ -0,0 +1,1 @@ +manual === modified file 'etc/init/lxc-android-config.conf' --- etc/init/lxc-android-config.conf 2014-04-04 11:08:30 +0000 +++ etc/init/lxc-android-config.conf 2014-04-05 11:07:46 +0000 @@ -4,7 +4,7 @@ description "lxc android config and container initialization" -start on started cgmanager +start on started cgroup-lite stop on runlevel [06] emits android === modified file 'usr/share/upstart/sessions/ubuntu-push-client.conf' --- usr/share/upstart/sessions/ubuntu-push-client.conf 2014-03-31 11:07:46 +0000 +++ usr/share/upstart/sessions/ubuntu-push-client.conf 2014-04-05 11:07:46 +0000 @@ -1,6 +1,6 @@ -description "Starts the ubuntu push notifications client side daemon" +description "ubuntu push notification client-side daemon" -start on dbus -stop on runlevel [06] +start on started dbus +stop on stopped dbus exec /usr/lib/ubuntu-push-client/ubuntu-push-client === modified file 'usr/share/upstart/sessions/url-dispatcher-refresh.conf' --- usr/share/upstart/sessions/url-dispatcher-refresh.conf 2014-04-02 11:08:53 +0000 +++ usr/share/upstart/sessions/url-dispatcher-refresh.conf 2014-04-05 11:07:46 +0000 @@ -4,6 +4,12 @@ emits url-dispatcher-update +# Work around for: https://bugs.launchpad.net/upstart/+bug/1302117 + +umask 0022 + +# end work around + pre-start script # If we're starting with url-dispatcher let's let the rest of the # system have a chance to settle. === modified file 'usr/share/upstart/sessions/url-dispatcher-update.conf' --- usr/share/upstart/sessions/url-dispatcher-update.conf 2014-04-02 11:08:53 +0000 +++ usr/share/upstart/sessions/url-dispatcher-update.conf 2014-04-05 11:07:46 +0000 @@ -1,5 +1,11 @@ description "URL Dispatcher Directory Watch" +# Work around for: https://bugs.launchpad.net/upstart/+bug/1302117 + +umask 0022 + +# end work around + start on (file FILE=~/.config/url-dispatcher/urls/*.url-dispatcher) or (file FILE=/usr/share/url-dispatcher/urls/*.url-dispatcher) or url-dispatcher-update instance $MATCH === modified file 'usr/share/upstart/sessions/url-dispatcher.conf' --- usr/share/upstart/sessions/url-dispatcher.conf 2013-11-18 12:42:03 +0000 +++ usr/share/upstart/sessions/url-dispatcher.conf 2014-04-05 11:07:46 +0000 @@ -6,6 +6,19 @@ respawn +# Work around for: https://bugs.launchpad.net/upstart/+bug/1302117 + +umask 0022 + +pre-start script + if [ -d "$HOME/.cache/url-dispatcher" ] && [ ! -x "$HOME/.cache/url-dispatcher" ] ; then + echo "Fixing cache directory permissions" + chmod 700 "$HOME/.cache/url-dispatcher" + fi +end script + +# end work around + emits application-start exec /usr/lib/i386-linux-gnu/url-dispatcher/url-dispatcher === modified file 'usr/share/upstart/sessions/usensord.conf' --- usr/share/upstart/sessions/usensord.conf 2014-01-15 12:07:53 +0000 +++ usr/share/upstart/sessions/usensord.conf 2014-04-05 11:07:46 +0000 @@ -1,6 +1,6 @@ -description "Starts the usensord service which provides haptics support" +description "usensord service for haptics support" -start on dbus -stop on runlevel [06] +start on started dbus +stop on stopped dbus exec usensord
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
