diff options
| author | Ubuntu <ubuntu@cert-jenkins-slave-1-201406-15260.maas> | 2022-04-12 08:27:51 +0000 |
|---|---|---|
| committer | Ubuntu <ubuntu@cert-jenkins-slave-1-201406-15260.maas> | 2022-04-12 08:27:51 +0000 |
| commit | 3a75e96f15036697cad5247029dfa4a6111f708e (patch) | |
| tree | a4ff7baf99219129a5c1bf2bf6775cf0a45caf6e /units/graphics | |
| parent | 6e813923e66585025c6411b5ccbf6232cf51a17a (diff) | |
| parent | 6cf5876f57aa990e3d6a5257fdc6fee70a8886e1 (diff) | |
Merge #419273 from ~sylvain-pineau/plainbox-provider-checkbox:fix-1968641
Diffstat (limited to 'units/graphics')
| -rw-r--r-- | units/graphics/jobs.pxu | 7 | ||||
| -rw-r--r-- | units/graphics/legacy.pxu | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu index d67af9e..185193b 100644 --- a/units/graphics/jobs.pxu +++ b/units/graphics/jobs.pxu @@ -7,7 +7,12 @@ id: graphics/{index}_driver_version_{product_slug} command: # shellcheck disable=SC1091 source graphics_env.sh {driver} {index} - graphics_driver.py + if [[ $XDG_SESSION_TYPE == "wayland" ]] + then + inxi_snapshot -Gazy + else + graphics_driver.py + fi estimated_duration: 0.5 _description: Parses Xorg.0.log and discovers the running X driver and version for the {vendor} {product} graphics card _summary: Test X driver/version for {vendor} {product} diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu index c2f2b53..14969b0 100644 --- a/units/graphics/legacy.pxu +++ b/units/graphics/legacy.pxu @@ -1,7 +1,13 @@ plugin: shell category_id: com.canonical.plainbox::graphics id: graphics/driver_version -command: graphics_driver.py +command: + if [[ $XDG_SESSION_TYPE == "wayland" ]] + then + inxi_snapshot -Gazy + else + graphics_driver.py + fi estimated_duration: 0.500 _description: Parses Xorg.0.Log and discovers the running X driver and version _summary: Test X driver/version |