Merge ~thesquash/ubuntu/+source/ubiquity:ubuntu/devel into ubuntu/+source/ubiquity:ubuntu/devel

Proposed by Gordon N. Squash
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: 6ca042a48bb03f55b56991604bc1369c594edf33
Proposed branch: ~thesquash/ubuntu/+source/ubiquity:ubuntu/devel
Merge into: ubuntu/+source/ubiquity:ubuntu/devel
Diff against target: 17 lines (+1/-5)
1 file modified
bin/ubiquity-dm (+1/-5)
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Ubuntu Server Dev import team Pending
Review via email: mp+407632@code.launchpad.net

Commit message

The code to export the $DISPLAY variable to D-Bus services, needed for
accessibility bus support, was only activated for stock Ubuntu and
Kubuntu but not for other derivatives like Ubuntu MATE. This commit
exports $DISPLAY on all spins of Ubuntu.

See https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1231091/comments/17
for far, far more details on this.

Description of the change

The code to export the $DISPLAY variable to D-Bus services, needed for
accessibility bus support, was only activated for stock Ubuntu and
Kubuntu but not for other derivatives like Ubuntu MATE. When merged,
this commit exports $DISPLAY on all spins of Ubuntu.

Fixes: https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1231091

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

Thanks for working on this and the detailed analysis Gordon! The correct upstream branch for ubiquity is located here:

https://code.launchpad.net/ubiquity/

But there is no need to create a new merge proposal as I've already manually merged your changes and uploaded a new version of ubiquity to the archive. It should make the RC images! Thanks again.

Revision history for this message
Ark74 (ark74) wrote :

Hi! quick question, is this likely to be backported back to Focal?

Or will go from Impish forward?
Thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/ubiquity-dm b/bin/ubiquity-dm
2index 08e96d1..227301c 100755
3--- a/bin/ubiquity-dm
4+++ b/bin/ubiquity-dm
5@@ -404,11 +404,7 @@ EndSection
6 stdin=null, stdout=logfile, stderr=logfile,
7 preexec_fn=self.drop_privileges))
8
9- if (
10- osextras.find_on_path("kwin") or
11- osextras.find_on_path("kwin_x11") or
12- osextras.find_on_path("gnome-shell")
13- ) and osextras.find_on_path("dbus-update-activation-environment"):
14+ if osextras.find_on_path("dbus-update-activation-environment"):
15 subprocess.Popen(
16 [
17 "dbus-update-activation-environment",

Subscribers

People subscribed via source and target branches