From 386de2e643a28d4dc490765964ed892a86b35baa Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Tue, 12 Nov 2024 15:50:30 +0800 Subject: [PATCH] enable disk encryption (cherry picked from commit e29039845b82549fbf48cd36ebda6d6ad10cf2fd) --- anaconda.spec | 12 ++++++++++-- bugfix-change-root-and-storage-interface-shows.patch | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/anaconda.spec b/anaconda.spec index fb00622..862b39b 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 38 +Release: 39 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -21,7 +21,6 @@ Patch9001: bugfix-GUI-nfs-unknown-error.patch Patch9002: bugfix-set-up-LD_PRELOAD-for-the-Storage-and-Services-module.patch Patch9003: bugfix-Solve-the-problem-that-the-circular-loading-progress-bar-does-not-rotate.patch Patch9004: change-inst-repo-default-value.patch -Patch9005: disable-disk-encryption.patch Patch9006: disable-ssh-login-checkbox.patch Patch9007: fix-hostname-info.patch Patch9008: hide-help-button.patch @@ -64,6 +63,9 @@ Patch10000: 0001-add-loongarch-support-for-anaconda.patch # https://github.com/rhinstaller/anaconda/pull/4235 Patch10001: 0001-check-that-the-password-contains-the-username.patch +%if ! 0%{?openEuler} +Patch9027: disable-disk-encryption.patch +%endif %define dasbusver 1.3 %define dbusver 1.2.3 @@ -318,6 +320,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Nov 12 2024 sunhai - 36.16.5-39 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: enable disk encryption + * Tue Aug 20 2024 songmingliang - 36.16.5-38 - Type:bugfix - ID:NA diff --git a/bugfix-change-root-and-storage-interface-shows.patch b/bugfix-change-root-and-storage-interface-shows.patch index 00cc6be..09eba94 100644 --- a/bugfix-change-root-and-storage-interface-shows.patch +++ b/bugfix-change-root-and-storage-interface-shows.patch @@ -113,8 +113,8 @@ index 3a75565..b9344da 100644 --- a/pyanaconda/ui/gui/spokes/lib/accordion.py +++ b/pyanaconda/ui/gui/spokes/lib/accordion.py @@ -544,7 +544,7 @@ class CreateNewPage(BasePage): - use_underline=True ) + self._createBox.attach(label, 0, 6, 2, 1) - checkbox = Gtk.CheckButton(label="Encrypt my data.") + checkbox = Gtk.CheckButton(label=_("Encrypt my data.")) -- Gitee