[master 2/3] Do not raise KickstartValueError for missing passphrase

vojtechtrefny installerbot-noreply at redhat.com
Tue Jul 21 11:04:20 UTC 2015


From: Vojtech Trefny <vtrefny at redhat.com>

Anaconda will ask for the passphrase, raising exception here will
cause kickstart data to be ignored.

Signed-off-by: Vojtech Trefny <vtrefny at redhat.com>
---
 pyanaconda/kickstart.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 7f9a0e0..31f3f38 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1030,10 +1030,6 @@ def execute(self, storage, ksdata, instClass):
             # before this one to setup the storage.encryptionPassphrase
             self.passphrase = self.passphrase or storage.encryptionPassphrase
 
-            if not self.passphrase:
-                raise KickstartValueError(formatErrorMsg(self.lineno,
-                                                         msg=_("No passphrase given for encrypted LV")))
-
             cert = getEscrowCertificate(storage.escrowCertificates, self.escrowcert)
             if self.preexist:
                 luksformat = fmt
@@ -1360,10 +1356,6 @@ def execute(self, storage, ksdata, instClass):
             # before this one to setup the storage.encryptionPassphrase
             self.passphrase = self.passphrase or storage.encryptionPassphrase
 
-            if not self.passphrase:
-                raise KickstartValueError(formatErrorMsg(self.lineno,
-                                                         msg=_("No passphrase given for encrypted part")))
-
             cert = getEscrowCertificate(storage.escrowCertificates, self.escrowcert)
             if self.onPart:
                 luksformat = kwargs["fmt"]


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/a00d2feb1033db28bfd35d4fabdf74d8feef625d


More information about the anaconda-patches mailing list