fix encypt shield
This commit is contained in:
parent
38f31603b3
commit
607ed5fb8c
@ -1,7 +1,7 @@
|
|||||||
%define _empty_manifest_terminate_build 0
|
%define _empty_manifest_terminate_build 0
|
||||||
Name: anaconda
|
Name: anaconda
|
||||||
Version: 36.16.5
|
Version: 36.16.5
|
||||||
Release: 36
|
Release: 37
|
||||||
Summary: Graphical system installer
|
Summary: Graphical system installer
|
||||||
License: GPLv2+ and MIT
|
License: GPLv2+ and MIT
|
||||||
URL: http://fedoraproject.org/wiki/Anaconda
|
URL: http://fedoraproject.org/wiki/Anaconda
|
||||||
@ -316,6 +316,12 @@ update-desktop-database &> /dev/null || :
|
|||||||
%{_prefix}/libexec/anaconda/dd_*
|
%{_prefix}/libexec/anaconda/dd_*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sat Jun 22 2024 sunhai <sunhai10@huawei.com> - 36.16.5-36
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
@ -113,8 +113,8 @@ index 3a75565..b9344da 100644
|
|||||||
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
|
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
|
||||||
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
|
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
|
||||||
@@ -544,7 +544,7 @@ class CreateNewPage(BasePage):
|
@@ -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.")
|
||||||
+ checkbox = Gtk.CheckButton(label=_("Encrypt my data."))
|
+ checkbox = Gtk.CheckButton(label=_("Encrypt my data."))
|
||||||
|
|||||||
@ -4,15 +4,16 @@ Date: Wed, 16 Sep 2020 15:28:39 +0800
|
|||||||
Subject: [PATCH] disable disk encryption
|
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 ++++---
|
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
|
diff --git a/pyanaconda/ui/gui/spokes/custom_storage.py b/pyanaconda/ui/gui/spokes/custom_storage.py
|
||||||
index 347a0e0..d72e315 100644
|
index 347a0e0..d72e315 100644
|
||||||
--- a/pyanaconda/ui/gui/spokes/custom_storage.py
|
--- a/pyanaconda/ui/gui/spokes/custom_storage.py
|
||||||
+++ b/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)
|
fancy_set_sensitive(self._reformatCheckbox, self._permissions.reformat)
|
||||||
|
|
||||||
# Set up the encryption.
|
# Set up the encryption.
|
||||||
@ -20,6 +21,7 @@ index 347a0e0..d72e315 100644
|
|||||||
- fancy_set_sensitive(self._encryptCheckbox, self._permissions.device_encrypted)
|
- fancy_set_sensitive(self._encryptCheckbox, self._permissions.device_encrypted)
|
||||||
+ self._encryptCheckbox.set_active(False)
|
+ self._encryptCheckbox.set_active(False)
|
||||||
+ fancy_set_sensitive(self._encryptCheckbox, False)
|
+ fancy_set_sensitive(self._encryptCheckbox, False)
|
||||||
|
+ self._encryptCheckbox.set_visible(False)
|
||||||
|
|
||||||
self._encryptCheckbox.set_inconsistent(self._request.container_encrypted)
|
self._encryptCheckbox.set_inconsistent(self._request.container_encrypted)
|
||||||
text = _("The container is encrypted.") if self._request.container_encrypted else ""
|
text = _("The container is encrypted.") if self._request.container_encrypted else ""
|
||||||
@ -41,6 +43,25 @@ index 347a0e0..d72e315 100644
|
|||||||
self._update_luks_combo()
|
self._update_luks_combo()
|
||||||
fancy_set_sensitive(self._fsCombo, self._permissions.format_type)
|
fancy_set_sensitive(self._fsCombo, self._permissions.format_type)
|
||||||
self.on_value_changed()
|
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
|
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
|
||||||
index 9494d6a..b2c0d3e 100644
|
index 9494d6a..b2c0d3e 100644
|
||||||
--- a/pyanaconda/ui/gui/spokes/storage.py
|
--- 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.
|
# Hide the reclaim space checkbox if automatic storage configuration is not used.
|
||||||
self._reclaim_revealer.set_reveal_child(
|
self._reclaim_revealer.set_reveal_child(
|
||||||
--
|
--
|
||||||
1.8.3.1
|
2.27.0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user