From 122fa28569fbcad660536dae7bbebdf65a98a126 Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Fri, 19 Sep 2025 15:21:18 +0800 Subject: [PATCH] backport upstream patches, fix displaying of the device label --- anaconda.spec | 10 ++++- ...i-Fix-displaying-of-the-device-label.patch | 39 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 backport-gui-Fix-displaying-of-the-device-label.patch diff --git a/anaconda.spec b/anaconda.spec index f095e58..a1f9614 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 48 +Release: 49 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -52,6 +52,8 @@ Patch6010: backport-a-riscv64-enablement-patch-from-upstream.patch Patch6011: backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch # https://github.com/rhinstaller/anaconda/pull/5884 Patch6012: backport-configure-only-append-fanalyzer-when-buildi.patch +# https://github.com/rhinstaller/anaconda/pull/5555 +Patch6013: backport-gui-Fix-displaying-of-the-device-label.patch Patch9023: bugfix-change-root-and-storage-interface-shows.patch Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch @@ -330,6 +332,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Fri Sep 19 2025 yueyuankun - 36.16.5-49 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: GUI: Correctly display device label + * Mon Jul 28 2025 Wenlong Zhang - 36.16.5-48 - Type:bugfix - ID:NA diff --git a/backport-gui-Fix-displaying-of-the-device-label.patch b/backport-gui-Fix-displaying-of-the-device-label.patch new file mode 100644 index 0000000..42e92e4 --- /dev/null +++ b/backport-gui-Fix-displaying-of-the-device-label.patch @@ -0,0 +1,39 @@ +From 7d771b57a7d876d86d0763550664eee1b2c3f94c Mon Sep 17 00:00:00 2001 +From: yueyuankun +Date: Fri, 12 Apr 2024 18:08:58 +0800 +Subject: [PATCH] gui: Fix displaying of the device label + +Signed-off-by: yueyuankun +--- + pyanaconda/ui/gui/spokes/installation_source.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py +index 5b55792..fd2d67f 100644 +--- a/pyanaconda/ui/gui/spokes/installation_source.py ++++ b/pyanaconda/ui/gui/spokes/installation_source.py +@@ -56,7 +56,7 @@ from pyanaconda.core.configuration.anaconda import conf + from pyanaconda.core.regexes import REPO_NAME_VALID, URL_PARSE, HOSTNAME_PATTERN_WITHOUT_ANCHORS + from pyanaconda.modules.common.constants.services import NETWORK, STORAGE + from pyanaconda.modules.common.constants.objects import DEVICE_TREE +-from pyanaconda.modules.common.structures.storage import DeviceData ++from pyanaconda.modules.common.structures.storage import DeviceFormatData + from pyanaconda.modules.common.util import is_module_available + from pyanaconda.core.storage import device_matches + +@@ -911,10 +911,10 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler): + self.initialize_done() + + def _show_autodetect_box_with_device(self, device_name): +- device_data = DeviceData.from_structure( +- self._device_tree.GetDeviceData(device_name) ++ device_format_data = DeviceFormatData.from_structure( ++ self._device_tree.GetFormatData(device_name) + ) +- device_label = device_data.attrs.get("label", "") ++ device_label = device_format_data.attrs.get("label", "") + self._show_autodetect_box(device_name, device_label) + + def _show_autodetect_box(self, device_name, device_label): +-- +2.43.0 -- Gitee