[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 6/6] Don't drop encryption when re-editing new encrypted partitions. (#582888)



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ack.

On Thu, 13 May 2010, David Lehman wrote:

---
iw/partition_dialog_gui.py |   12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
index 9279636..8f3d320 100644
--- a/iw/partition_dialog_gui.py
+++ b/iw/partition_dialog_gui.py
@@ -193,6 +193,8 @@ class PartitionEditor:
                    request = self.origrequest
                    request.weight = weight

+                usedev = request
+
                if self.lukscb and self.lukscb.get_active() and \
                   request.format.type != "luks":
                    luksformat = format
@@ -214,6 +216,14 @@ class PartitionEditor:
                        luksdev = None

                    actions.append(ActionDestroyFormat(request))
+                elif self.lukscb and self.lukscb.get_active() and \
+                     self.origrequest.format.type == "luks":
+                    # re-edit of new encrypted partition. we're only updating
+                    # the formatting on the LUKS device
+                    try:
+                        usedev = self.storage.devicetree.getChildren(self.origrequest)[0]
+                    except IndexError:
+                        pass

                if self.isNew:
                    # we're all set, so create the actions
@@ -226,7 +236,7 @@ class PartitionEditor:
                    request.req_primary = primary
                    request.req_disks = disks

-                actions.append(ActionCreateFormat(request, format))
+                actions.append(ActionCreateFormat(usedev, format))
                if luksdev:
                    actions.append(ActionCreateDevice(luksdev))
                    actions.append(ActionCreateFormat(luksdev))


- -- David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iEYEARECAAYFAkv0p/gACgkQ5hsjjIy1Vkn7wACg3DsmuBBA5W0skzvMBQ8bJrm0
2JsAoJgUktl+C/cMb8cwqvqRAbe+/Kv9
=+q82
-----END PGP SIGNATURE-----


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]