------------------------------------------------------------ revno: 52 committer: Dimitri John Ledkov <[email protected]> branch nick: upstart-jobs timestamp: Wed 2014-04-02 12:08:53 +0100 message: auto update removed: etc/init/boot-hooks/set-display-mir.conf etc/init/neutron-plugin-metering-agent.conf etc/init/neutron-plugin-vpn-agent.conf added: usr/share/upstart/sessions/url-dispatcher-refresh.conf usr/share/upstart/sessions/url-dispatcher-update.conf modified: etc/init/neutron-l3-agent.conf usr/share/upstart/sessions/dbus.conf usr/share/upstart/sessions/indicator-sound.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
=== removed file 'etc/init/boot-hooks/set-display-mir.conf' --- etc/init/boot-hooks/set-display-mir.conf 2014-03-12 12:07:43 +0000 +++ etc/init/boot-hooks/set-display-mir.conf 1970-01-01 00:00:00 +0000 @@ -1,39 +0,0 @@ -# set-display-mir - creates .display-mir file once (on supported devices) - -author "Loïc Minier <[email protected]>" -description "Creates .display-mir file once" - -# start when first boot-hooks event is emitted and before lxc-android-config -# starts as it disables SurfaceFlinger based on the Mir flag -start on boot-hooks and starting lxc-android-config - -# NOT a task as otherwise this would block restarting lxc-android-config - -setuid phablet -setgid phablet -chdir /home/phablet -env FLAG=.set-display-mir-done2 -env OLDFLAG=.set-display-mir-done -env DISPLAY_MIR=.display-mir - -# work needs to be done in pre-start as this really is a job with nothing to -# start -pre-start script - rm -f "$OLDFLAG" - - # XXX this is what we should be using, but this job gets started with - # "WHEN=every-boot" and then doesn't get the second event for - # "WHEN=new-version" - #if [ "$WHEN" = "new-version" ] && [ ! -e "$FLAG" ]; then - if [ ! -e "$FLAG" ]; then - # only enable on supported devices - case "$(getprop ro.product.device)" in - grouper|maguro|mako|manta|generic|flo|deb|hammerhead) - touch "$DISPLAY_MIR" - ;; - esac - - touch "$FLAG" - fi -end script - === modified file 'etc/init/neutron-l3-agent.conf' --- etc/init/neutron-l3-agent.conf 2014-01-28 12:07:48 +0000 +++ etc/init/neutron-l3-agent.conf 2014-04-02 11:08:53 +0000 @@ -19,4 +19,6 @@ fi end script -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/l3-agent.log +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \ + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \ + --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log === removed file 'etc/init/neutron-plugin-metering-agent.conf' --- etc/init/neutron-plugin-metering-agent.conf 2013-11-18 12:42:03 +0000 +++ etc/init/neutron-plugin-metering-agent.conf 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ -# vim:set ft=upstart ts=2 et: -description "Neutron metering agent" -author "Chuck Short <[email protected]>" - -start on runlevel [2345] -stop on runlevel [!2345] - -respawn - -chdir /var/run - -pre-start script - mkdir -p /var/run/neutron - chown neutron:root /var/run/neutron -end script - -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metering-agent -- \ - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metering_agent.ini \ - --log-file=/var/log/neutron/metering_agent.log === removed file 'etc/init/neutron-plugin-vpn-agent.conf' --- etc/init/neutron-plugin-vpn-agent.conf 2013-11-18 12:42:03 +0000 +++ etc/init/neutron-plugin-vpn-agent.conf 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ -# vim:set ft=upstart ts=2 et: -description "Neutron vpn Plugin Agent" -author "Chuck Short <[email protected]>" - -start on runlevel [2345] -stop on runlevel [!2345] - -respawn - -chdir /var/run - -pre-start script - mkdir -p /var/run/neutron - chown neutron:root /var/run/neutron -end script - -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \ - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \ - --log-file=/var/log/neutron/vpn_agent.log === modified file 'usr/share/upstart/sessions/dbus.conf' --- usr/share/upstart/sessions/dbus.conf 2013-12-06 17:20:05 +0000 +++ usr/share/upstart/sessions/dbus.conf 2014-04-02 11:08:53 +0000 @@ -10,6 +10,7 @@ pre-start script DBUS_SESSION_BUS_ADDRESS=unix:abstract=$(mktemp -u /tmp/dbus-XXXXXXXXXX) initctl set-env --global DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS + [ -d "$HOME/.cache/upstart" ] || mkdir -p "$HOME/.cache/upstart" echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >$HOME/.cache/upstart/dbus-session end script === modified file 'usr/share/upstart/sessions/indicator-sound.conf' --- usr/share/upstart/sessions/indicator-sound.conf 2013-12-06 17:20:05 +0000 +++ usr/share/upstart/sessions/indicator-sound.conf 2014-04-02 11:08:53 +0000 @@ -1,11 +1,9 @@ -description "Indicator Sound Backend" - -# Want to move to indicator-services-[start|end], but that's not all -# there yet. Use the signals that exist today for now. - -start on indicators-loaded or indicator-services-start +description "Indicator Sound Service" + +start on indicator-services-start stop on desktop-end or indicator-services-end respawn +respawn limit 2 10 exec /usr/lib/i386-linux-gnu/indicator-sound/indicator-sound-service === added file 'usr/share/upstart/sessions/url-dispatcher-refresh.conf' --- usr/share/upstart/sessions/url-dispatcher-refresh.conf 1970-01-01 00:00:00 +0000 +++ usr/share/upstart/sessions/url-dispatcher-refresh.conf 2014-04-02 11:08:53 +0000 @@ -0,0 +1,18 @@ +description "Ensure the URL dispatcher database is up-to-date, likely at session init" + +start on started url-dispatcher + +emits url-dispatcher-update + +pre-start script +# If we're starting with url-dispatcher let's let the rest of the +# system have a chance to settle. + if [ "$UPSTART_EVENTS" = "started" ] ; then + sleep 60 + fi +end script + +script + initctl emit --no-wait url-dispatcher-update "MATCH=$HOME/.config/url-dispatcher/urls/" + initctl emit --no-wait url-dispatcher-update "MATCH=/usr/share/url-dispatcher/urls/" +end script === added file 'usr/share/upstart/sessions/url-dispatcher-update.conf' --- usr/share/upstart/sessions/url-dispatcher-update.conf 1970-01-01 00:00:00 +0000 +++ usr/share/upstart/sessions/url-dispatcher-update.conf 2014-04-02 11:08:53 +0000 @@ -0,0 +1,7 @@ +description "URL Dispatcher Directory Watch" + +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 + +exec /usr/lib/i386-linux-gnu/url-dispatcher/update-directory "$MATCH"
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
