Fix errors

poncovka · Jan 12, 2023 · 36f73f7 · 36f73f7
1 parent a82595a
commit 36f73f7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
@@ -54,7 +54,7 @@ from pykickstart.commands.mediacheck import FC4_MediaCheck as MediaCheck
 from pykickstart.commands.driverdisk import F14_DriverDisk as DriverDisk
 from pykickstart.commands.network import F27_Network as Network
 from pykickstart.commands.displaymode import F26_DisplayMode as DisplayMode
-from pykickstart.commands.bootloader import F34_Bootloader as Bootloader
+from pykickstart.commands.bootloader import F38_Bootloader as Bootloader
 
 # Default logging: none
 log = logging.getLogger('parse-kickstart').addHandler(logging.NullHandler())

diff --git a/pyanaconda/modules/storage/bootloader/bootloader.py b/pyanaconda/modules/storage/bootloader/bootloader.py
@@ -509,10 +509,10 @@ def generate_initramfs_with_tasks(self, payload_type, kernel_versions):
         """
         return [
             RecreateInitrdsTask(
+                storage=self.storage,
                 payload_type=payload_type,
                 kernel_versions=kernel_versions,
                 sysroot=conf.target.system_root,
-                storage=self.storage
             ),
             FixBTRFSBootloaderTask(
                 storage=self.storage,

diff --git a/pyanaconda/modules/storage/bootloader/installation.py b/pyanaconda/modules/storage/bootloader/installation.py
@@ -173,7 +173,7 @@ def run(self):
 class RecreateInitrdsTask(Task):
     """Installation task that recreates the initrds."""
 
-    def __init__(self, payload_type, kernel_versions, sysroot, storage):
+    def __init__(self, storage, payload_type, kernel_versions, sysroot):
         """Create a new task."""
         super().__init__()
         self._storage = storage

diff --git a/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_bootloader.py b/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_bootloader.py
@@ -483,10 +483,12 @@ def test_create_bls_entries(self, exec_mock):
     @patch('pyanaconda.modules.storage.bootloader.utils.conf')
     def test_recreate_initrds(self, conf_mock, exec_mock):
         """Test the installation task that recreates initrds."""
+        storage = Mock(bootloader=EFIGRUB())
         version = "4.17.7-200.fc28.x86_64"
 
         with tempfile.TemporaryDirectory() as root:
             task = RecreateInitrdsTask(
+                storage=storage,
                 sysroot=root,
                 payload_type=PAYLOAD_TYPE_RPM_OSTREE,
                 kernel_versions=[version]
@@ -499,6 +501,7 @@ def test_recreate_initrds(self, conf_mock, exec_mock):
 
         with tempfile.TemporaryDirectory() as root:
             task = RecreateInitrdsTask(
+                storage=storage,
                 sysroot=root,
                 payload_type=PAYLOAD_TYPE_LIVE_IMAGE,
                 kernel_versions=[version]
@@ -526,6 +529,7 @@ def test_recreate_initrds(self, conf_mock, exec_mock):
             open(root + "/usr/sbin/new-kernel-pkg", 'wb').close()
 
             task = RecreateInitrdsTask(
+                storage=storage,
                 sysroot=root,
                 payload_type=PAYLOAD_TYPE_LIVE_IMAGE,
                 kernel_versions=[version]
@@ -546,6 +550,7 @@ def test_recreate_initrds(self, conf_mock, exec_mock):
 
         with tempfile.TemporaryDirectory() as root:
             task = RecreateInitrdsTask(
+                storage=storage,
                 sysroot=root,
                 payload_type=PAYLOAD_TYPE_LIVE_IMAGE,
                 kernel_versions=[version]