Merge lp:~3v1n0/unity/always-use-upstart into lp:unity

[Marco Trevisan (Treviño)]

Unity7.conf: Always use upstart to launch compiz

We should always use upstart to launch compiz, as it really respawn always.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3786
http://jenkins.qa.ubuntu.com/job/unity-ci/885/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/419

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/885/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Mh, it seems that doing this might cause some env variables set by the autostart tools launched by gnome-session (i.e. gnome-keyring-daemon) not to be inherited by unity (while they work on terminal launched by ctrl+alt+t by unity-settings-daemon)...

[Andrea Azzarone (azzar1)]

Can you test this again? I'm attaching the diff between the output of "env" command launched from two different terminals (one launched using ctrl+alt+t, the other using unity):

8c8
< TERMINATOR_UUID=urn:uuid:bf5b3d1b-8327-4562-b5f9-698543f14588
---
> TERMINATOR_UUID=urn:uuid:6b7fbcf5-eb9e-4eae-8348-6a442e9e374b
9a10,11
> SESSION=ubuntu
> GIO_LAUNCHED_DESKTOP_FILE_PID=19234
13c15
< WINDOWID=58720260
---
> WINDOWID=62914564
24a27
> GIO_LAUNCHED_DESKTOP_FILE=/home/andrea/.local/share/applications/x-terminal-emulator.desktop
33c36
< JOB=gnome-session
---
> JOB=unity-settings-daemon
51c54
< UPSTART_EVENTS=started starting
---
> UPSTART_EVENTS=xsession started
53a57
> COMPIZ_BIN_PATH=/usr/bin/
58,59c62,63
< INSTANCE=Unity
< UPSTART_JOB=unity-settings-daemon
---
> INSTANCE=
> UPSTART_JOB=unity7

It seems fine to me? Can you confirm? Would be nice to have this fixed.

[Marco Trevisan (Treviño) (3v1n0)]

Yep, there are some minor changes to apply to gnome-session to get this properly working. I've something almost ready.

=== modified file 'debian/unity7.conf'
--- debian/unity7.conf	2014-02-10 12:34:09 +0000
+++ debian/unity7.conf	2014-04-17 01:11:38 +0000
@@ -4,19 +4,8 @@
 start on xsession SESSION=ubuntu and (started gnome-settings-daemon or started unity-settings-daemon)
 stop on desktop-end
 
-pre-start script
-  # If gnome-session is going to start compiz,
-  # we don't want to be the ones doing it.
-
-  if grep -q compiz /usr/share/gnome-session/sessions/ubuntu.session ; then
-    echo "GNOME Session is starting Compiz"
-    stop ; exit 0
-  fi
-end script
-
 env COMPIZ_CONFIG_PROFILE="ubuntu"
 export COMPIZ_CONFIG_PROFILE
 
 respawn
 exec compiz
-