Nux

Merge lp:~3v1n0/nux/x11-conffile-on-unity-only-x into lp:nux/xenial

Proposed by Marco Trevisan (Treviño) on 2018-06-13
Status: Merged
Approved by: Iain Lane on 2018-06-13
Approved revision: 885
Merge reported by: Marco Trevisan (Treviño)
Merged at revision: not available
Proposed branch: lp:~3v1n0/nux/x11-conffile-on-unity-only-x
Merge into: lp:nux/xenial
Diff against target: 41 lines (+23/-2)
2 files modified
debian/50_check_unity_support (+14/-2)
debian/changelog (+9/-0)
To merge this branch: bzr merge lp:~3v1n0/nux/x11-conffile-on-unity-only-x
Reviewer Review Type Date Requested Status
Iain Lane 2018-06-13 Approve on 2018-06-13
Review via email: mp+347864@code.launchpad.net

Commit message

X11-check-unity-support: only run when called from an unity session

The content of $XDG_CURRENT_DESKTOP is checked inside a sub-shell
not to affect the value of IFS for all the scripts sourced by the X session.

If running in Unity we should call unity_support_test, not inside gnome
ubuntu X sessions.

XDG_CURRENT_DESKTOP values are currently the followings:
 - unity before 17.10: Unity
 - unity after 17.10: Unity:Unity7:ubuntu
 - gnome session: GNOME
 - ubuntu gnome session: ubuntu:GNOME

To post a comment you must log in.
885. By Marco Trevisan (Treviño) on 2018-06-13

Revert: "debian: don't consider the Xsession.d script as a config file anymore"

It seems something there's not full agreement on it, so to avoid further discussions
I'm reverting this back. However I strongly believe that given the current tools we have
this is the way to go, as debian doesn't provide other tools to get this done.
Nor X11 can move files outside of /etc.

Iain Lane (laney) wrote :

cheers

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/50_check_unity_support'
2--- debian/50_check_unity_support 2013-08-12 11:20:24 +0000
3+++ debian/50_check_unity_support 2018-06-13 12:18:53 +0000
4@@ -2,6 +2,18 @@
5 # If the hardware does not pass unity_support_test, fall back to LLVMpipe
6 # which does.
7
8-if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then
9- /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
10+if [ "x$DESKTOP_SESSION" = "xubuntu" ] && [ -x "/usr/lib/nux/unity_support_test" ]; then
11+ (
12+ IFS=':'
13+ for d in $XDG_CURRENT_DESKTOP; do
14+ if [ "x$d" = "xUnity" ] || [ "x$d" = "xUnity7" ]; then
15+ return 0
16+ fi
17+ done
18+ return 1
19+ )
20+
21+ if [ $? = 0 ]; then
22+ /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
23+ fi
24 fi
25
26=== modified file 'debian/changelog'
27--- debian/changelog 2017-08-16 22:04:15 +0000
28+++ debian/changelog 2018-06-13 12:18:53 +0000
29@@ -1,3 +1,12 @@
30+nux (4.0.8+16.04.20170816-0ubuntu2) UNRELEASED; urgency=medium
31+
32+ * debian/50_check_unity_support:
33+ - various changes to fix (LP: #1768610):
34+ + export LIBGL_ALWAYS_SOFTWARE=1 only on command failure
35+ + run only when called inside an unity session
36+
37+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 13 Jun 2018 03:35:45 +0200
38+
39 nux (4.0.8+16.04.20170816-0ubuntu1) xenial; urgency=medium
40
41 * TextEntry: Make sure Ctr+{C,V,X,A} work with caps-lock on (LP:

Subscribers

People subscribed via source and target branches