From 4d07ee88a872c5941dc975426243a86d61afe909 Mon Sep 17 00:00:00 2001 From: songnannan Date: Wed, 1 Jan 2020 04:32:45 +0800 Subject: [PATCH] init --- anaconda.spec | 9 +++++- bugfix-for-encrypting-partion.patch | 47 +++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 bugfix-for-encrypting-partion.patch diff --git a/anaconda.spec b/anaconda.spec index 3ac0e6c..c0f8d60 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Name: anaconda Version: 29.24.7 -Release: 17 +Release: 18 Summary: Graphical system installer License: GPLv2+ and MIT URL: https://fedoraproject.org/wiki/Anaconda @@ -39,6 +39,7 @@ Patch9021: anaconda-add-quiet-cmdline-args-for-x86.patch Patch9022: anaconda-modify-interface-is-extended-in-Chinese-mod.patch Patch9023: bugfix-fix-vender-issue.patch Patch9024: bugfix-disable-adding-virtual-device-in-network-spokes.patch +Patch9025: bugfix-for-encrypting-partion.patch BuildRequires: audit-libs-devel libtool gettext-devel >= 0.19.8 gtk3-devel >= 3.22.17 BuildRequires: gtk-doc gtk3-devel-docs >= 3.22.17 glib2-doc gobject-introspection-devel @@ -211,6 +212,12 @@ update-desktop-database &> /dev/null || : %{_datadir}/gtk-doc %changelog +* Wed Feb 1 2020 openEuler Buildteam - 29.24.7-18 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:bugfix for encrypting partition + * Mon Dec 30 2019 openEuler Buildteam - 29.24.7-17 - Type:bugfix - ID:NA diff --git a/bugfix-for-encrypting-partion.patch b/bugfix-for-encrypting-partion.patch new file mode 100644 index 0000000..bf542a1 --- /dev/null +++ b/bugfix-for-encrypting-partion.patch @@ -0,0 +1,47 @@ +From 213e913ffd1fd9f7ba48315fcb6644b8486f65ba Mon Sep 17 00:00:00 2001 +From: fengtao +Date: Wed, 1 Jan 2020 04:26:27 +0800 +Subject: [PATCH] bugfix for encrypting partion + +--- + pyanaconda/ui/gui/spokes/custom_storage.py | 2 +- + pyanaconda/ui/gui/spokes/storage.py | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/pyanaconda/ui/gui/spokes/custom_storage.py b/pyanaconda/ui/gui/spokes/custom_storage.py +index 2eb72e6..0e52d01 100644 +--- a/pyanaconda/ui/gui/spokes/custom_storage.py ++++ b/pyanaconda/ui/gui/spokes/custom_storage.py +@@ -1611,7 +1611,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageCheckHandler): + use_dev.exists and not use_dev.format_immutable) + + self._encryptCheckbox.set_active(isinstance(device, LUKSDevice)) +- fancy_set_sensitive(self._encryptCheckbox, self._reformatCheckbox.get_active()) ++ fancy_set_sensitive(self._encryptCheckbox, False) + + ancestors = use_dev.ancestors + ancestors.remove(use_dev) +diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py +index b57c44d..b3b6fba 100644 +--- a/pyanaconda/ui/gui/spokes/storage.py ++++ b/pyanaconda/ui/gui/spokes/storage.py +@@ -311,6 +311,7 @@ class StorageSpoke(NormalSpoke, StorageCheckHandler): + self._cur_clicked_overview = None + + self._grabObjects() ++ self._encryption_revealer.set_reveal_child(False) + + self._autoPart.connect("toggled", self._method_radio_button_toggled) + self._customPart.connect("toggled", self._method_radio_button_toggled) +@@ -369,7 +370,7 @@ class StorageSpoke(NormalSpoke, StorageCheckHandler): + self._encryption_revealer.set_reveal_child(False) + self._encrypted.set_active(False) + else: +- self._encryption_revealer.set_reveal_child(True) ++ self._encryption_revealer.set_reveal_child(False) + + # Hide the reclaim space checkbox if automatic storage configuration is not used. + if self._get_selected_partitioning_method() == PartitioningMethod.AUTO: +-- +1.8.3.1 +