diff options
| author | Ted Gould <ted@gould.cx> | 2016-07-20 17:08:01 +0200 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2016-07-20 17:08:01 +0200 |
| commit | 0794e1e677ab54bd46c6e64cd6c2f34d11c74971 (patch) | |
| tree | a60a47fd082cb7bc494cbd8e7c203d903dae8c2b /debian | |
| parent | 58d55cce6ba8d1c74933c273ec0ea74ae1493ac6 (diff) | |
Switch to everything using the same shell script
(bzr r4153.9.7)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/unity7.conf | 22 | ||||
| -rw-r--r-- | debian/unity7.service | 2 |
2 files changed, 2 insertions, 22 deletions
diff --git a/debian/unity7.conf b/debian/unity7.conf index 7290000ad..2e53bf215 100644 --- a/debian/unity7.conf +++ b/debian/unity7.conf @@ -4,27 +4,7 @@ author "Ted Gould <ted@ubuntu.com>, Marco Trevisan <marco@ubuntu.com>" start on xsession SESSION=ubuntu and 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 - - compiz_profile="ubuntu" - - if ! /usr/lib/nux/unity_support_test -p; then - compiz_profile="ubuntu-lowgfx" - fi - - echo "Using compiz profile '$compiz_profile'" - initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile" - export COMPIZ_CONFIG_PROFILE="$compiz_profile" - - /usr/lib/unity/unity-active-plugins-safety-check -end script +pre-start exec /usr/lib/unity/unity-compiz-profile respawn exec compiz diff --git a/debian/unity7.service b/debian/unity7.service index a7f71b9b5..deebf9aaf 100644 --- a/debian/unity7.service +++ b/debian/unity7.service @@ -6,6 +6,6 @@ After=unity-settings-daemon.service PartOf=graphical-session.target [Service] -Environment=COMPIZ_CONFIG_PROFILE=ubuntu ExecStart=/usr/bin/compiz +ExecStart.Pre=/usr/lib/unity/unity-compiz-profile Restart=on-failure |