------------------------------------------------------------
revno: 28
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Tue 2014-02-04 12:07:45 +0000
message:
auto update
modified:
etc/init/lightdm.conf
etc/init/thermald.conf
usr/share/upstart/sessions/application-click.conf
usr/share/upstart/sessions/application.conf
usr/share/upstart/sessions/unity8.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/lightdm.conf'
--- etc/init/lightdm.conf 2013-11-18 12:42:03 +0000
+++ etc/init/lightdm.conf 2014-02-04 12:07:45 +0000
@@ -52,6 +52,8 @@
end script
post-stop script
+ clear > /dev/tty7
+ sleep 1
if [ "$UPSTART_STOP_EVENTS" = runlevel ]; then
initctl emit desktop-shutdown
fi
=== modified file 'etc/init/thermald.conf'
--- etc/init/thermald.conf 2014-01-11 12:08:48 +0000
+++ etc/init/thermald.conf 2014-02-04 12:07:45 +0000
@@ -2,15 +2,20 @@
# Upstart configuration file
# Manages platform thermals
-description "thermal daemon"
+description "thermal daemon"
start on started dbus
stop on stopping dbus
+#
+# don't respawn on error
+#
+normal exit 1
+
respawn
+#
+# consider something wrong if respawned 10 times in 1 minute
+#
+respawn limit 10 60
-script
-echo "Waiting for thermal zone and coretemp sysfs to be ready "
-sleep 5
exec thermald --no-daemon --dbus-enable
-end script
=== modified file 'usr/share/upstart/sessions/application-click.conf'
--- usr/share/upstart/sessions/application-click.conf 2014-01-31 12:08:44 +0000
+++ usr/share/upstart/sessions/application-click.conf 2014-02-04 12:07:45 +0000
@@ -13,9 +13,6 @@
# For Surface Flinger
env APP_DESKTOP_FILE
-env UPSTART_APP_LAUNCH_ARCH="i386-linux-gnu"
-export UPSTART_APP_LAUNCH_ARCH
-
apparmor switch ${APP_ID}
pre-start script
=== modified file 'usr/share/upstart/sessions/application.conf'
--- usr/share/upstart/sessions/application.conf 2014-01-31 12:08:44 +0000
+++ usr/share/upstart/sessions/application.conf 2014-02-04 12:07:45 +0000
@@ -2,7 +2,6 @@
author "Ted Gould <[email protected]>"
start on application-start
-task
# Events aren't emitted directly, but start is used to create them
emits application-legacy-start
=== modified file 'usr/share/upstart/sessions/unity8.conf'
--- usr/share/upstart/sessions/unity8.conf 2014-01-31 12:08:44 +0000
+++ usr/share/upstart/sessions/unity8.conf 2014-02-04 12:07:45 +0000
@@ -24,7 +24,6 @@
# Point all future jobs in this session to our Mir socket instead of
# unity-system-compositor's socket.
initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
- gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
fi
end script
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
