From cda786d1e83d3782f77aca0be016f582907867c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 31 May 2013 15:57:47 -0400 Subject: [PATCH 1/2] Add upstart user job --- debian/changelog | 4 ++++ debian/lubuntu-default-settings.install | 1 + usr/share/upstart/sessions/startlubuntu.conf | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 usr/share/upstart/sessions/startlubuntu.conf diff --git a/debian/changelog b/debian/changelog index 7fc96e4..bbac62f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ lubuntu-default-settings (0.32) UNRELEASED; urgency=low + [ Julien Lavergne ] * Add a new QLubuntu session, by using only Qt applications * usr/bin/start* - Remove gnome-keyring workaround, since we have the proper fix for ssh. @@ -16,6 +17,9 @@ lubuntu-default-settings (0.32) UNRELEASED; urgency=low * etc/xdg/lubuntu/libfm/libfm.conf - Rebase with new upstream options. + [ Stéphane Graber ] + * Add startlubuntu upstart user job. + -- Julien Lavergne Wed, 20 Mar 2013 23:23:40 +0100 lubuntu-default-settings (0.31) raring; urgency=low diff --git a/debian/lubuntu-default-settings.install b/debian/lubuntu-default-settings.install index 559bcf7..d2520fc 100644 --- a/debian/lubuntu-default-settings.install +++ b/debian/lubuntu-default-settings.install @@ -4,6 +4,7 @@ usr/share/gdm/ usr/share/lubuntu/ usr/share/lxpanel/ usr/share/lxterminal/ +usr/share/upstart/sessions/ usr/share/xsessions/ usr/share/applications/lubuntu-screenlock.desktop usr/share/applications/lubuntu-browser.desktop diff --git a/usr/share/upstart/sessions/startlubuntu.conf b/usr/share/upstart/sessions/startlubuntu.conf new file mode 100644 index 0000000..5e538b5 --- /dev/null +++ b/usr/share/upstart/sessions/startlubuntu.conf @@ -0,0 +1,16 @@ +description "Lubuntu session" +author "Stéphane Graber " + +start on started dbus and xsession SESSION=Lubuntu + +emits desktop-start +emits desktop-end + +exec startlubuntu + +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 From 7a9a5ff6a07b4e62eca154a8e935ba93c6d1bb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 31 May 2013 16:36:34 -0400 Subject: [PATCH 2/2] Update the upstart job for the new xsessions. --- .../upstart/sessions/{startlubuntu.conf => lxsession.conf} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename usr/share/upstart/sessions/{startlubuntu.conf => lxsession.conf} (80%) diff --git a/usr/share/upstart/sessions/startlubuntu.conf b/usr/share/upstart/sessions/lxsession.conf similarity index 80% rename from usr/share/upstart/sessions/startlubuntu.conf rename to usr/share/upstart/sessions/lxsession.conf index 5e538b5..cfe1c36 100644 --- a/usr/share/upstart/sessions/startlubuntu.conf +++ b/usr/share/upstart/sessions/lxsession.conf @@ -1,12 +1,12 @@ description "Lubuntu session" author "Stéphane Graber " -start on started dbus and xsession SESSION=Lubuntu +start on started dbus and xsession SESSIONTYPE=lxsession emits desktop-start emits desktop-end -exec startlubuntu +exec /usr/bin/lxsession -s $DESKTOP_SESSION -e LXDE post-start exec initctl emit desktop-start DESKTOP_SESSION=$DESKTOP_SESSION