Merge lp:~laney/upstart/xsession-sessiontype into lp:ubuntu/raring/upstart

[Iain Lane]

Currently the gnome-session user job's start on condition is

  start on xsession SESSION=ubuntu

which seems overly specific. That job can work for any gnome-session.

While the Xsession.d scripts are being processed, there is a $BASESTARTUP variable set in 55gnome-session_gnomerc that we can use to determine which session manager is being used. Currently we only look for gnome-session but others could extend this if they wish.

If accepted, I'll modify gnome-session's job accordingly.

[lp:~laney/upstart/xsession-sessiontype]

1434. By Iain Lane on 2013-03-14

Quote variable

[Stéphane Graber (stgraber)]

Looks good

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-07 21:16:26 +0000
+++ debian/changelog	2013-03-14 16:57:22 +0000
@@ -1,3 +1,10 @@
+upstart (1.7-0ubuntu2) UNRELEASED; urgency=low
+
+  * Set $SESSIONTYPE when emitting the xsession event that specifies the type
+    of session being launched. Currently only gnome-session is supported.
+
+ -- Iain Lane <[e-mail]>  Thu, 14 Mar 2013 16:28:35 +0000
+
 upstart (1.7-0ubuntu1) raring; urgency=low
 
   [ Stéphane Graber ]
 
=== modified file 'debian/user-conf/xsession-init.conf'
--- debian/user-conf/xsession-init.conf	2013-03-07 18:52:38 +0000
+++ debian/user-conf/xsession-init.conf	2013-03-14 16:57:22 +0000
@@ -9,5 +9,5 @@
 end script
 
 script
-    exec initctl emit xsession SESSION=$DESKTOP_SESSION
+    exec initctl emit xsession SESSION=$DESKTOP_SESSION SESSIONTYPE=$SESSIONTYPE
 end script
 
=== modified file 'debian/xsession.d/99upstart'
--- debian/xsession.d/99upstart	2013-03-07 18:52:38 +0000
+++ debian/xsession.d/99upstart	2013-03-14 16:57:22 +0000
@@ -1,5 +1,11 @@
 # Start the user session
 if [ -n "$UPSTART" ]; then
+    case "$BASESTARTUP" in
+        gnome-session*)
+            export SESSIONTYPE=gnome-session
+            ;;
+    esac
+
     STARTUP="init --user"
     unset UPSTART
 fi