Drop two unapplied patches
This commit is contained in:
Adam Williamson
parent
d025fb7181
commit
36312aafff
|
|
@ -1,46 +0,0 @@
|
|||
From 427f98963643e7f823f650dab015c80d854aa2d1 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Thu, 19 May 2022 09:50:17 -0700
|
||||
Subject: [PATCH] Specify that we want the Adwaita icon theme
|
||||
|
||||
Back in 38556e7e in 2016 when anaconda switched from 'gnome'
|
||||
icon theme, intending to use 'Adwaita' instead, we dropped the
|
||||
line that specifically declares what theme anaconda wants to
|
||||
use. Presumably we expected GTK would always pick Adwaita for
|
||||
us. However, with GTK 3.24.34, this seems to not reliably happen
|
||||
on KDE. On KDE images, the breeze icon theme is installed, and
|
||||
it also provides many of the icons anaconda uses. When running
|
||||
anaconda on a KDE live image with GTK 3.24.34, we're often seeing
|
||||
the icons from the breeze theme used instead of the icons from
|
||||
the Adwaita theme. This happened in 4 out of 4 tests on openQA
|
||||
prod, 3 out of 4 tests on openQA stg, and 5 out of 5 tests I
|
||||
ran in a VM myself. I then applied this change directly to the
|
||||
file in the VM and re-tested another 5 times; all 5 times the
|
||||
right icons were shown.
|
||||
|
||||
I'm not sure why this is suddenly a problem with GTK 3.24.34
|
||||
when it never was before even though both icon themes have been
|
||||
in KDE for years, but this seems correct anyway. We definitely
|
||||
want anaconda to use the Adwaita icons, not ones from any other
|
||||
theme.
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
pyanaconda/ui/gui/__init__.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
|
||||
index d458b66f14..428f30e744 100644
|
||||
--- a/pyanaconda/ui/gui/__init__.py
|
||||
+++ b/pyanaconda/ui/gui/__init__.py
|
||||
@@ -754,6 +754,7 @@ class GraphicalUserInterface(UserInterface):
|
||||
# Set some program-wide settings.
|
||||
settings = Gtk.Settings.get_default()
|
||||
settings.set_property("gtk-font-name", "Cantarell")
|
||||
+ settings.set_property("gtk-icon-theme-name", "Adwaita")
|
||||
|
||||
# Get the path to the application data
|
||||
data_path = os.environ.get("ANACONDA_DATA", "/usr/share/anaconda")
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From 216c1aa6684cbed2a7869d48f97bea95cb503ab6 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Tue, 8 Mar 2022 16:10:30 -0800
|
||||
Subject: [PATCH] network: Handle network configuration paths not existing
|
||||
|
||||
When installing network configuration files, we shouldn't assume
|
||||
that the relevant paths (network-scripts and system-connections)
|
||||
actually exist, they don't have to. NetworkManager has split
|
||||
/etc/sysconfig/network-scripts off into a subpackage that is
|
||||
no longer installed by default. We guarded against this in
|
||||
`get_config_files_paths` already, but not in
|
||||
`_copy_device_config_files`.
|
||||
---
|
||||
pyanaconda/modules/network/installation.py | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/pyanaconda/modules/network/installation.py b/pyanaconda/modules/network/installation.py
|
||||
index f46574e6f6..3ac65e0df0 100644
|
||||
--- a/pyanaconda/modules/network/installation.py
|
||||
+++ b/pyanaconda/modules/network/installation.py
|
||||
@@ -240,15 +240,17 @@ Name={}
|
||||
:param root: path to the root of the target system
|
||||
:type root: str
|
||||
"""
|
||||
- for config_file in os.listdir(self.NETWORK_SCRIPTS_DIR_PATH):
|
||||
- if config_file.startswith(self.NETWORK_SCRIPTS_CONFIG_FILE_PREFIXES):
|
||||
- config_file_path = os.path.join(self.NETWORK_SCRIPTS_DIR_PATH,
|
||||
+ if os.path.exists(self.NETWORK_SCRIPTS_DIR_PATH):
|
||||
+ for config_file in os.listdir(self.NETWORK_SCRIPTS_DIR_PATH):
|
||||
+ if config_file.startswith(self.NETWORK_SCRIPTS_CONFIG_FILE_PREFIXES):
|
||||
+ config_file_path = os.path.join(self.NETWORK_SCRIPTS_DIR_PATH,
|
||||
+ config_file)
|
||||
+ self._copy_file_to_root(root, config_file_path)
|
||||
+ if os.path.exists(self.NM_SYSTEM_CONNECTIONS_DIR_PATH):
|
||||
+ for config_file in os.listdir(self.NM_SYSTEM_CONNECTIONS_DIR_PATH):
|
||||
+ config_file_path = os.path.join(self.NM_SYSTEM_CONNECTIONS_DIR_PATH,
|
||||
config_file)
|
||||
self._copy_file_to_root(root, config_file_path)
|
||||
- for config_file in os.listdir(self.NM_SYSTEM_CONNECTIONS_DIR_PATH):
|
||||
- config_file_path = os.path.join(self.NM_SYSTEM_CONNECTIONS_DIR_PATH,
|
||||
- config_file)
|
||||
- self._copy_file_to_root(root, config_file_path)
|
||||
|
||||
def _copy_dhclient_config_files(self, root, network_ifaces):
|
||||
"""Copy dhclient configuration files to target system.
|
||||
--
|
||||
2.35.1
|
||||
|
||||
Loading…
Reference in New Issue