diff options
| author | Iain Lane <iain.lane@canonical.com> | 2021-01-25 18:24:07 +0000 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2021-01-25 18:27:08 +0000 |
| commit | 365ce53aa2beb6dad17234aaa5789a68c2220438 (patch) | |
| tree | a154b660ef67c1b5bd5fe91d4acf8547afa7e6d6 /bin/ubiquity-dm | |
| parent | fd67db00e84c2e61cdbf7c6e4d22053bd25c0d07 (diff) | |
21.04.5 (patches unapplied)import/21.04.5
Imported using git-ubuntu import.
Notes
Notes:
[ Mauricio Faria de Oliveira ]
* ubiquity/plugins/ubi-prepare.py: let the prepare page run in
automatic mode to install 3rd party drivers. (LP: #1895351)
[ Iain Lane ]
* Drop all "from __future__ import print". This was kept 8 years ago when
porting to py3, because pyflakes required it at the time to work properly.
* ubiquity-dm: Set DISPLAY in the systemd environment for kubuntu too.
* netcfg/tests/tests.mk: Disable -Werror=format.
Upstream `check` has rewritten the macros, and now they trip these
warnings. They should be updated to use ck_assert_* really.
[ Shih-Yuan Lee (FourDollars) ]
* install_misc.py: Use another mechanism to install the packages. (LP:
#1908023)
Diffstat (limited to 'bin/ubiquity-dm')
| -rwxr-xr-x | bin/ubiquity-dm | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/bin/ubiquity-dm b/bin/ubiquity-dm index f6fbc3e7a..08e96d16b 100755 --- a/bin/ubiquity-dm +++ b/bin/ubiquity-dm @@ -1,7 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function - import errno import getpass import grp @@ -406,6 +404,24 @@ EndSection stdin=null, stdout=logfile, stderr=logfile, preexec_fn=self.drop_privileges)) + if ( + osextras.find_on_path("kwin") or + osextras.find_on_path("kwin_x11") or + osextras.find_on_path("gnome-shell") + ) and osextras.find_on_path("dbus-update-activation-environment"): + subprocess.Popen( + [ + "dbus-update-activation-environment", + "--verbose", + "--systemd", + "DISPLAY", + ], + stdin=null, + stdout=logfile, + stderr=logfile, + preexec_fn=self.drop_privileges, + ) + # Accessibility infrastructure proc_cmdline = [] with open('/proc/cmdline', 'r') as fp: @@ -507,8 +523,7 @@ EndSection 'dbus-update-activation-environment')): subprocess.Popen( ['dbus-update-activation-environment', - '--verbose', '--systemd', 'XDG_CURRENT_DESKTOP', - 'DISPLAY'], + '--verbose', '--systemd', 'XDG_CURRENT_DESKTOP'], stdin=null, stdout=logfile, stderr=logfile, preexec_fn=self.drop_privileges) @@ -700,7 +715,7 @@ EndSection if 'access=v1' not in proc_cmdline: log('paint background') path = \ - '/usr/share/wallpapers/Next/contents/images/2560x1600.jpg' + '/usr/share/wallpapers/Next/contents/images/2560x1600.png' extras.append(subprocess.Popen( ['ubiquity-qtsetbg', path], stdin=null, stdout=logfile, stderr=logfile, |