From 607ed5fb8c0763e500a9563209b9875f5149b375 Mon Sep 17 00:00:00 2001
From: sun_hai_10 <sunhai10@huawei.com>
Date: Wed, 26 Jun 2024 11:34:57 +0800
Subject: [PATCH] fix encypt shield

---
 anaconda.spec                                 |  8 ++++-
 ...nge-root-and-storage-interface-shows.patch |  2 +-
 disable-disk-encryption.patch                 | 29 ++++++++++++++++---
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/anaconda.spec b/anaconda.spec
index 84b86f6..9e9b3ce 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
 %define _empty_manifest_terminate_build 0
 Name:    anaconda
 Version: 36.16.5
-Release: 36
+Release: 37
 Summary: Graphical system installer
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -316,6 +316,12 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Wed Jun 26 2024 sunhai <sunhai10@huawei.com> - 36.16.5-37
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: fix encypt shield
+
 * Sat Jun 22 2024 sunhai <sunhai10@huawei.com> - 36.16.5-36
 - 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 09eba94..00cc6be 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."))
diff --git a/disable-disk-encryption.patch b/disable-disk-encryption.patch
index bdddea0..b069316 100644
--- a/disable-disk-encryption.patch
+++ b/disable-disk-encryption.patch
@@ -4,15 +4,16 @@ Date: Wed, 16 Sep 2020 15:28:39 +0800
 Subject: [PATCH] disable disk encryption
 
 ---
- pyanaconda/ui/gui/spokes/custom_storage.py | 8 ++++----
+ pyanaconda/ui/gui/spokes/custom_storage.py | 9 +++++----
+ pyanaconda/ui/gui/spokes/lib/accordion.py  | 2 --
  pyanaconda/ui/gui/spokes/storage.py        | 7 ++++---
- 2 files changed, 8 insertions(+), 7 deletions(-)
+ 3 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/pyanaconda/ui/gui/spokes/custom_storage.py b/pyanaconda/ui/gui/spokes/custom_storage.py
 index 347a0e0..d72e315 100644
 --- a/pyanaconda/ui/gui/spokes/custom_storage.py
 +++ b/pyanaconda/ui/gui/spokes/custom_storage.py
-@@ -796,8 +796,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageCheckHandler):
+@@ -796,8 +796,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageCheckHandler):
          fancy_set_sensitive(self._reformatCheckbox, self._permissions.reformat)
  
          # Set up the encryption.
@@ -20,6 +21,7 @@ index 347a0e0..d72e315 100644
 -        fancy_set_sensitive(self._encryptCheckbox, self._permissions.device_encrypted)
 +        self._encryptCheckbox.set_active(False)
 +        fancy_set_sensitive(self._encryptCheckbox, False)
++        self._encryptCheckbox.set_visible(False)
  
          self._encryptCheckbox.set_inconsistent(self._request.container_encrypted)
          text = _("The container is encrypted.") if self._request.container_encrypted else ""
@@ -41,6 +43,25 @@ index 347a0e0..d72e315 100644
          self._update_luks_combo()
          fancy_set_sensitive(self._fsCombo, self._permissions.format_type)
          self.on_value_changed()
+diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
+index b9344da..235890f 100644
+--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
++++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
+@@ -542,7 +542,6 @@ class CreateNewPage(BasePage):
+             wrap=True,
+             use_underline=True
+         )
+-        self._createBox.attach(label, 0, 6, 2, 1)
+ 
+         checkbox = Gtk.CheckButton(label="Encrypt my data.")
+         checkbox.connect("toggled", encrypted_changed_cb)
+@@ -552,6 +551,5 @@ class CreateNewPage(BasePage):
+         checkbox.set_hexpand(False)
+ 
+         label.set_mnemonic_widget(checkbox)
+-        self._createBox.attach(checkbox, 0, 7, 2, 1)
+ 
+         self.add(self._createBox)
 diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
 index 9494d6a..b2c0d3e 100644
 --- a/pyanaconda/ui/gui/spokes/storage.py
@@ -67,5 +88,5 @@ index 9494d6a..b2c0d3e 100644
          # Hide the reclaim space checkbox if automatic storage configuration is not used.
          self._reclaim_revealer.set_reveal_child(
 -- 
-1.8.3.1
+2.27.0