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

[PATCH 1/3] Support grub --encrypted when set from kickstart (mitr, #554874).



---
 anaconda.spec.in        |    2 +-
 pyanaconda/booty/x86.py |    4 ++--
 pyanaconda/kickstart.py |    7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 8bee230..63c2e58 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define intltoolver 0.31.2-3
 %define libnlver 1.0
 %define libselinuxver 1.6
-%define pykickstartver 1.77
+%define pykickstartver 1.79
 %define rpmpythonver 4.2-0.61
 %define slangver 2.0.6-2
 %define yumver 2.9.2
diff --git a/pyanaconda/booty/x86.py b/pyanaconda/booty/x86.py
index a396283..defd1fa 100644
--- a/pyanaconda/booty/x86.py
+++ b/pyanaconda/booty/x86.py
@@ -330,7 +330,7 @@ class x86BootloaderInfo(efiBootloaderInfo):
 
             
         if self.password:
-            f.write('password --md5 %s\n' %(self.password))
+            f.write('password --encrypted %s\n' %(self.password))
         
         for (label, longlabel, version) in kernelList:
             kernelTag = "-" + version
@@ -540,7 +540,7 @@ class x86BootloaderInfo(efiBootloaderInfo):
         args = bootloaderInfo.getArgList(self)
 
         if self.password:
-            args.append("--md5pass=%s" %(self.password))
+            args.append("--password=%s" %(self.password))
 
         return args
 
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index b60086d..ecc3e8b 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -232,7 +232,7 @@ class AutoStep(commands.autostep.FC3_AutoStep):
         flags.autostep = 1
         flags.autoscreenshot = self.autoscreenshot
 
-class Bootloader(commands.bootloader.F14_Bootloader):
+class Bootloader(commands.bootloader.F15_Bootloader):
     def execute(self, anaconda):
         if self.location == "none":
             location = None
@@ -257,10 +257,7 @@ class Bootloader(commands.bootloader.F14_Bootloader):
                 anaconda.bootloader.args.append(self.appendLine)
 
             if self.password:
-                anaconda.bootloader.setPassword(self.password, isCrypted = 0)
-
-            if self.md5pass:
-                anaconda.bootloader.setPassword(self.md5pass)
+                anaconda.bootloader.setPassword(self.password, isCrypted = self.isCrypted)
 
             if location != None:
                 anaconda.bootloader.defaultDevice = location
-- 
1.7.1.1


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