Merge lp:~3v1n0/unity/upstart-lowgfx-profile into lp:unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4144
Proposed branch: lp:~3v1n0/unity/upstart-lowgfx-profile
Merge into: lp:unity
Prerequisite: lp:~3v1n0/unity/lowgfx-mode-less-effects
Diff against target: 34 lines (+11/-6)
1 file modified
debian/unity7.conf (+11/-6)
To merge this branch: bzr merge lp:~3v1n0/unity/upstart-lowgfx-profile
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+299073@code.launchpad.net

This proposal supersedes a proposal from 2016-07-04.

Commit message

unity7.conf: use different compiz profile based on unity_support_test result

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/unity7.conf'
--- debian/unity7.conf 2014-02-10 12:34:09 +0000
+++ debian/unity7.conf 2016-07-05 01:26:19 +0000
@@ -1,7 +1,7 @@
1description "Unity Shell v7"1description "Unity Shell v7"
2author "Ted Gould <ted@ubuntu.com>"2author "Ted Gould <ted@ubuntu.com>, Marco Trevisan <marco@ubuntu.com>"
33
4start on xsession SESSION=ubuntu and (started gnome-settings-daemon or started unity-settings-daemon)4start on xsession SESSION=ubuntu and started unity-settings-daemon
5stop on desktop-end5stop on desktop-end
66
7pre-start script7pre-start script
@@ -12,11 +12,16 @@
12 echo "GNOME Session is starting Compiz"12 echo "GNOME Session is starting Compiz"
13 stop ; exit 013 stop ; exit 0
14 fi14 fi
15
16 compiz_profile="ubuntu"
17
18 if ! /usr/lib/nux/unity_support_test -p; then
19 compiz_profile="ubuntu-lowgfx"
20 fi
21
22 echo "Using compiz profile '$compiz_profile'"
23 initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile"
15end script24end script
1625
17env COMPIZ_CONFIG_PROFILE="ubuntu"
18export COMPIZ_CONFIG_PROFILE
19
20respawn26respawn
21exec compiz27exec compiz
22