Checkbox Provider - Base

Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1691433 into plainbox-provider-checkbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-checkbox
  3. fix-1691433
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: b16692b6152d9a0be3a261d7eafd3f33c095249b
Merged at revision: b7b0d71def3e17a97ebbe5884baccf10b87523ef
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:fix-1691433
Merge into: plainbox-provider-checkbox:master
Diff against target: 15 lines (+2/-2)
1 file modified
bin/graphics_env (+2/-2)
Reviewer Review Type Date Requested Status
Taihsiang Ho Approve
Paul Larson Approve
Review via email: mp+324165@code.launchpad.net

Description of the change

Fixes linked bug

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

one question: Is this still xenial only? Otherwise, +1

review: Approve
Revision history for this message
Taihsiang Ho (tai271828) wrote :

@Paul It is still Xenial only. Please refer to the line if [[ $UBUNTU_CODENAME == "xenial" ]].

Revision history for this message
Taihsiang Ho (tai271828) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/graphics_env b/bin/graphics_env
2index 55a3486..8c82567 100755
3--- a/bin/graphics_env
4+++ b/bin/graphics_env
5@@ -11,8 +11,8 @@ INDEX=$2
6 UBUNTU_CODENAME=`lsb_release -c | awk {'print $2'}`
7
8 # We only want to set the DRI_PRIME env variable on Xenial (16.04) systems
9-# with more than 1 GPU running the amdgpu driver.
10-if [[ $DRIVER == "amdgpu" ]]; then
11+# with more than 1 GPU running the amdgpu/radeon drivers.
12+if [[ $DRIVER == "amdgpu" || $DRIVER == "radeon" ]]; then
13 if [[ $UBUNTU_CODENAME == "xenial" ]]; then
14 NB_GPU=`udev_resource -l VIDEO | grep -oP -m1 '\d+'`
15 if [ $NB_GPU -gt 1 ]; then

Subscribers

People subscribed via source and target branches