------------------------------------------------------------
revno: 40
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Fri 2014-02-21 12:07:42 +0000
message:
auto update
removed:
usr/share/upstart/sessions/gnome-settings-daemon.override
added:
usr/share/upstart/sessions/gnome-session.conf
usr/share/upstart/sessions/untrusted-helper-type-end.conf
usr/share/upstart/sessions/untrusted-helper.conf
modified:
etc/init/lightdm.override
--
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.override'
--- etc/init/lightdm.override 2013-11-18 12:42:03 +0000
+++ etc/init/lightdm.override 2014-02-21 12:07:42 +0000
@@ -2,10 +2,8 @@
oom score -10
# lightdm job normally waits for plymouth-ready, but since we disable plymouth,
-# we remove that condition from lightdm's start stanza; also, we want to wait
-# on lxc-android-config to get the Android drivers setup
+# we remove that condition from lightdm's start stanza
start on ((filesystem
and runlevel [!06]
- and started dbus
- and started lxc-android-config)
+ and started dbus)
or runlevel PREVLEVEL=S)
=== added file 'usr/share/upstart/sessions/gnome-session.conf'
--- usr/share/upstart/sessions/gnome-session.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/gnome-session.conf 2014-02-21 12:07:42 +0000
@@ -0,0 +1,25 @@
+description "Gnome Session itself"
+author "Stéphane Graber <[email protected]>"
+
+start on started dbus and xsession SESSIONTYPE=gnome-session
+stop on starting gnome-session INSTANCE!=$DESKTOP_SESSION
+
+env GNOME_DESKTOP_SESSION_ID=this-is-deprecated
+export GNOME_DESKTOP_SESSION_ID
+
+instance $DESKTOP_SESSION
+
+emits desktop-start
+emits desktop-end
+
+script
+unset UPSTART_EVENTS UPSTART_INSTANCE UPSTART_JOB
+exec gnome-session --session=$DESKTOP_SESSION
+end script
+
+post-start exec initctl emit desktop-start DESKTOP_SESSION=$DESKTOP_SESSION
+
+# Don't wait to avoid blocking the session from ending.
+pre-stop exec initctl emit --no-wait desktop-end DESKTOP_SESSION=$DESKTOP_SESSION
+
+post-stop exec dbus-send --type=method_call --address=$UPSTART_SESSION /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession
=== removed file 'usr/share/upstart/sessions/gnome-settings-daemon.override'
--- usr/share/upstart/sessions/gnome-settings-daemon.override 2014-02-09 12:08:51 +0000
+++ usr/share/upstart/sessions/gnome-settings-daemon.override 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-start on started dbus and starting gnome-session
-
-pre-start script
- # This is temporary override until unity-settings-daemon is in main
- # and used by default in unity session
-
- [ "$DESKTOP_SESSION" = "ubuntu" ] || { exit 0; }
-
- if initctl status 2>/dev/null 1>/dev/null unity-settings-daemon ; then
- stop ; exit 0
- fi
-
-end script
=== added file 'usr/share/upstart/sessions/untrusted-helper-type-end.conf'
--- usr/share/upstart/sessions/untrusted-helper-type-end.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/untrusted-helper-type-end.conf 2014-02-21 12:07:42 +0000
@@ -0,0 +1,9 @@
+description "End all untrusted helpers of a particular type, usually when the manager ends"
+
+start on untrusted-helper-type-end
+
+instance ${HELPER_TYPE}
+
+emits untrusted-helper-end
+
+exec /usr/lib/i386-linux-gnu/upstart-app-launch/untrusted-helper-type-end
=== added file 'usr/share/upstart/sessions/untrusted-helper.conf'
--- usr/share/upstart/sessions/untrusted-helper.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/untrusted-helper.conf 2014-02-21 12:07:42 +0000
@@ -0,0 +1,31 @@
+description "Untrusted Helpers installed from Click Packages"
+
+start on untrusted-helper-start
+stop on untrusted-helper-end or desktop-end
+
+instance ${HELPER_TYPE}:${INSTANCE_ID}:${APP_ID}
+
+env APP_ID
+env APP_EXEC="echo Error"
+env HELPER_TYPE
+env INSTANCE_ID=""
+env APP_URIS
+
+env UPSTART_APP_LAUNCH_ARCH="i386-linux-gnu"
+export UPSTART_APP_LAUNCH_ARCH
+
+apparmor switch ${APP_ID}
+oom score 800
+
+# This is unconfined
+pre-start script
+ if [ -x "/usr/lib/i386-linux-gnu/upstart-app-launch/${HELPER_TYPE}/exec-tool" ] ; then
+ /usr/lib/i386-linux-gnu/upstart-app-launch/${HELPER_TYPE}/exec-tool
+ else
+ echo "Unable to find exec tool for ${HELPER_TYPE}"
+ exit -1
+ fi
+end script
+
+# Remember, this is confined
+exec /usr/lib/i386-linux-gnu/upstart-app-launch/exec-line-exec
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
