summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2008-09-15 13:05:10 -0500
committerDavid Lehman <dlehman@redhat.com>2008-09-15 13:27:28 -0500
commita8a09759882e3c053de9c521d433e468ec18a67e (patch)
treee76def3b007ed39a9ebc22db6b256cb07a7b28e3
parentc19c23eaf1654adf88e7575b062538da6f353584 (diff)
downloadanaconda-a8a09759882e3c053de9c521d433e468ec18a67e.tar.gz
anaconda-a8a09759882e3c053de9c521d433e468ec18a67e.tar.xz
anaconda-a8a09759882e3c053de9c521d433e468ec18a67e.zip
If it's encrypted, it's encrypted. Passphrases will get sorted out.
-rw-r--r--fsset.py2
-rw-r--r--partRequests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/fsset.py b/fsset.py
index 705d75de2..c9ed9d279 100644
--- a/fsset.py
+++ b/fsset.py
@@ -2248,7 +2248,7 @@ class Device:
self.isSetup = 0
self.doLabel = 1
self.deviceOptions = ""
- if encryption and encryption.passphrase:
+ if encryption:
self.crypto = encryption
# mount by device since the name is based only on UUID
self.doLabel = None
diff --git a/partRequests.py b/partRequests.py
index b2fd15956..57d89cde6 100644
--- a/partRequests.py
+++ b/partRequests.py
@@ -209,7 +209,7 @@ class RequestSpec:
return self.resizable and self.fstype is not None and self.fstype.isResizable()
def isEncrypted(self, partitions, parentOnly = False):
- if self.encryption and self.encryption.passphrase:
+ if self.encryption:
return True
return False