------------------------------------------------------------
revno: 29
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Wed 2014-02-05 12:07:41 +0000
message:
auto update
removed:
usr/share/upstart/sessions/unity8.override
added:
etc/init/plymouth-shutdown.conf
etc/init/plymouth-shutdown.override
modified:
etc/init/plymouth.conf
etc/init/rc.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
=== added file 'etc/init/plymouth-shutdown.conf'
--- etc/init/plymouth-shutdown.conf 1970-01-01 00:00:00 +0000
+++ etc/init/plymouth-shutdown.conf 2014-02-05 12:07:41 +0000
@@ -0,0 +1,25 @@
+# plymouth - Userspace bootsplash utility
+#
+# plymouth provides a boot splash screen on the system console using
+# the kernel framebuffer device. On boot, this is nominally started by
+# the initramfs so the pre-start script, script and post-start script
+# parts are actually not run. These are normally run on shutdown instead.
+
+description "userspace bootsplash utility"
+
+start on (runlevel [016]
+ and (stopped xdm
+ or stopped uxlaunch))
+
+expect fork
+kill timeout 60
+
+pre-start script
+ status lightdm >/dev/null 2>/dev/null && start wait-for-state WAITER=plymouth-shutdown WAIT_FOR=lightdm TARGET_GOAL=stop WAIT_STATE=waiting || :
+end script
+
+exec /sbin/plymouthd --mode=shutdown
+
+post-start exec /bin/plymouth show-splash
+
+pre-stop exec /bin/plymouth quit
=== added file 'etc/init/plymouth-shutdown.override'
--- etc/init/plymouth-shutdown.override 1970-01-01 00:00:00 +0000
+++ etc/init/plymouth-shutdown.override 2014-02-05 12:07:41 +0000
@@ -0,0 +1,1 @@
+manual
=== modified file 'etc/init/plymouth.conf'
--- etc/init/plymouth.conf 2013-11-18 12:42:03 +0000
+++ etc/init/plymouth.conf 2014-02-05 12:07:41 +0000
@@ -7,27 +7,11 @@
description "userspace bootsplash utility"
-start on (starting mountall
- or (runlevel [016]
- and (desktop-shutdown
- or stopped xdm
- or stopped uxlaunch)))
+start on starting mountall
expect fork
kill timeout 60
-script
- if [ "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" -o "$RUNLEVEL" = "6" ]; then
- exec /sbin/plymouthd --mode=shutdown
- else
- exec /sbin/plymouthd --mode=boot --attach-to-session
- fi
-end script
-
-post-start script
- if [ "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" -o "$RUNLEVEL" = "6" ]; then
- exec /bin/plymouth show-splash
- fi
-end script
+exec /sbin/plymouthd --mode=boot --attach-to-session
pre-stop exec /bin/plymouth quit
=== modified file 'etc/init/rc.conf'
--- etc/init/rc.conf 2013-11-18 12:42:03 +0000
+++ etc/init/rc.conf 2014-02-05 12:07:41 +0000
@@ -20,4 +20,9 @@
task
-exec /etc/init.d/rc $RUNLEVEL
+script
+if [ "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" -o "$RUNLEVEL" = "6" ]; then
+ status plymouth-shutdown 2>/dev/null >/dev/null && start wait-for-state WAITER=rc WAIT_FOR=plymouth-shutdown || :
+fi
+/etc/init.d/rc $RUNLEVEL
+end script
=== modified file 'usr/share/upstart/sessions/unity8.conf'
--- usr/share/upstart/sessions/unity8.conf 2014-02-04 12:07:45 +0000
+++ usr/share/upstart/sessions/unity8.conf 2014-02-05 12:07:41 +0000
@@ -4,6 +4,8 @@
start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
stop on desktop-end
+kill timeout 30
+
respawn
expect stop
@@ -24,6 +26,7 @@
# 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
=== removed file 'usr/share/upstart/sessions/unity8.override'
--- usr/share/upstart/sessions/unity8.override 2013-12-24 12:07:48 +0000
+++ usr/share/upstart/sessions/unity8.override 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-kill timeout 30
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
