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

Proposed by Marco Trevisan (Treviño) on 2016-07-04
Status: Merged
Approved by: Andrea Azzarone on 2016-07-04
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) 2016-07-04 Approve on 2016-07-04
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.
Andrea Azzarone (azzar1) wrote :

+1

review: Approve
4144. By Marco Trevisan (Treviño) on 2016-07-05

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

Use low graphics mode when support test fails

Preview Diff

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