------------------------------------------------------------
revno: 32
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sun 2014-02-09 12:08:51 +0000
message:
auto update
added:
usr/share/upstart/sessions/gnome-settings-daemon.override
usr/share/upstart/sessions/unity-settings-daemon.conf
modified:
etc/init/binfmt-support.conf
usr/share/upstart/sessions/application-click.conf
usr/share/upstart/sessions/application-legacy.conf
usr/share/upstart/sessions/application.conf
usr/share/upstart/sessions/gnome-session.conf
usr/share/upstart/sessions/gnome-settings-daemon.conf
usr/share/upstart/sessions/unity7.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/binfmt-support.conf'
--- etc/init/binfmt-support.conf 2013-12-30 12:08:19 +0000
+++ etc/init/binfmt-support.conf 2014-02-09 12:08:51 +0000
@@ -28,4 +28,4 @@
task
-exec update-binfmts --enable
+exec /usr/sbin/update-binfmts --enable
=== modified file 'usr/share/upstart/sessions/application-click.conf'
--- usr/share/upstart/sessions/application-click.conf 2014-02-04 12:07:45 +0000
+++ usr/share/upstart/sessions/application-click.conf 2014-02-09 12:08:51 +0000
@@ -7,12 +7,15 @@
stop on application-end or desktop-end
env APP_ID
-env APP_EXEC="echo Error"
+env APP_EXEC
env APP_URIS
env APP_DIR
# 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-legacy.conf'
--- usr/share/upstart/sessions/application-legacy.conf 2013-12-06 17:20:05 +0000
+++ usr/share/upstart/sessions/application-legacy.conf 2014-02-09 12:08:51 +0000
@@ -7,7 +7,7 @@
stop on application-end or desktop-end
env APP_ID
-env APP_EXEC="echo Error"
+env APP_EXEC
env APP_EXEC_POLICY=""
env APP_URIS
# For Surface Flinger
=== modified file 'usr/share/upstart/sessions/application.conf'
--- usr/share/upstart/sessions/application.conf 2014-02-04 12:07:45 +0000
+++ usr/share/upstart/sessions/application.conf 2014-02-09 12:08:51 +0000
@@ -2,6 +2,7 @@
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/gnome-session.conf'
--- usr/share/upstart/sessions/gnome-session.conf 2013-12-06 17:20:05 +0000
+++ usr/share/upstart/sessions/gnome-session.conf 2014-02-09 12:08:51 +0000
@@ -2,10 +2,13 @@
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
=== modified file 'usr/share/upstart/sessions/gnome-settings-daemon.conf'
--- usr/share/upstart/sessions/gnome-settings-daemon.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/gnome-settings-daemon.conf 2014-02-09 12:08:51 +0000
@@ -1,7 +1,7 @@
description "The Gnome Settings Daemon"
author "Stéphane Graber <[email protected]>"
-start on started dbus and starting gnome-session
+start on started dbus and starting gnome-session INSTANCE!=ubuntu
stop on stopping gnome-session
respawn
=== added file 'usr/share/upstart/sessions/gnome-settings-daemon.override'
--- usr/share/upstart/sessions/gnome-settings-daemon.override 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/gnome-settings-daemon.override 2014-02-09 12:08:51 +0000
@@ -0,0 +1,13 @@
+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/unity-settings-daemon.conf'
--- usr/share/upstart/sessions/unity-settings-daemon.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/unity-settings-daemon.conf 2014-02-09 12:08:51 +0000
@@ -0,0 +1,12 @@
+description "The Unity Settings Daemon"
+author "Dimitri John Ledkov <[email protected]>"
+
+start on started dbus and starting gnome-session
+stop on stopping gnome-session
+
+pre-start script
+ [ "$DESKTOP_SESSION" = "ubuntu" ] || { stop; exit 0; }
+end script
+
+respawn
+exec /usr/lib/unity-settings-daemon/unity-settings-daemon
=== modified file 'usr/share/upstart/sessions/unity7.conf'
--- usr/share/upstart/sessions/unity7.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/unity7.conf 2014-02-09 12:08:51 +0000
@@ -1,7 +1,7 @@
description "Unity Shell v7"
author "Ted Gould <[email protected]>"
-start on xsession SESSION=ubuntu and started gnome-settings-daemon
+start on xsession SESSION=ubuntu and (started gnome-settings-daemon or started unity-settings-daemon)
stop on desktop-end
pre-start script
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
