------------------------------------------------------------ revno: 33 committer: Dimitri John Ledkov <[email protected]> branch nick: upstart-jobs timestamp: Tue 2014-02-11 12:08:05 +0000 message: auto update added: usr/share/upstart/sessions/application-failed.conf modified: etc/init/pollinate.conf usr/share/upstart/sessions/application.conf usr/share/upstart/sessions/indicator-sync.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/pollinate.conf' --- etc/init/pollinate.conf 2014-01-17 12:08:22 +0000 +++ etc/init/pollinate.conf 2014-02-11 12:08:05 +0000 @@ -1,11 +1,11 @@ # pollinate - seed the PRNG using an Entropy-as-a-Service provider -description "Entropy-as-a-Service client" -author "Dustin Kirkland <[email protected]>" - -setuid root - -start on (started networking or starting ssh) +description "Seed the pseudo random number generator on first boot" +author "Dustin Kirkland <[email protected]>" + +setuid pollinate + +start on (started networking or starting ssh or starting cloud-init) script . /etc/default/pollinate === added file 'usr/share/upstart/sessions/application-failed.conf' --- usr/share/upstart/sessions/application-failed.conf 1970-01-01 00:00:00 +0000 +++ usr/share/upstart/sessions/application-failed.conf 2014-02-11 12:08:05 +0000 @@ -0,0 +1,6 @@ +description "Application Failing" + +start on stopped application-legacy RESULT=failed or stopped application-click RESULT=failed +task + +exec /usr/lib/i386-linux-gnu/upstart-app-launch/application-failed === modified file 'usr/share/upstart/sessions/application.conf' --- usr/share/upstart/sessions/application.conf 2014-02-09 12:08:51 +0000 +++ usr/share/upstart/sessions/application.conf 2014-02-11 12:08:05 +0000 @@ -14,24 +14,4 @@ env APP_URIS export APP_URIS -script - CLICK_PKG=`echo "${APP_ID}" | cut -d _ -f 1` - - if [ ! -z $CLICK_PKG ] ; then - CLICK_DIR=`click pkgdir "${CLICK_PKG}" 2> /dev/null || true` - fi - - if [ ! -z $CLICK_DIR ] && [ -d $CLICK_DIR ] ; then - if ! start application-click APP_ID="${APP_ID}" APP_URIS="${APP_URIS}"; then - /usr/lib/i386-linux-gnu/upstart-app-launch/second-exec - fi - else - if /usr/lib/i386-linux-gnu/upstart-app-launch/desktop-single $APP_ID ; then - if ! start application-legacy APP_ID="${APP_ID}" INSTANCE_ID="" APP_URIS="${APP_URIS}" ; then - /usr/lib/i386-linux-gnu/upstart-app-launch/second-exec - fi - else - start application-legacy APP_ID="${APP_ID}" INSTANCE_ID=`date -u +%s` APP_URIS="${APP_URIS}" - fi - fi -end script +exec /usr/lib/i386-linux-gnu/upstart-app-launch/application-job === modified file 'usr/share/upstart/sessions/indicator-sync.conf' --- usr/share/upstart/sessions/indicator-sync.conf 2013-12-06 17:20:05 +0000 +++ usr/share/upstart/sessions/indicator-sync.conf 2014-02-11 12:08:05 +0000 @@ -5,4 +5,14 @@ respawn +# limit to two times in a five second period +respawn limit 2 5 + +pre-start script + # The sync indicator shouldn't be on the greeter + if [ "${USER}" = "lightdm" ]; then + stop + fi +end script + exec /usr/lib/i386-linux-gnu/indicator-sync/indicator-sync-service
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
