Skip to content

Commit 946e913

Browse files
committed
Update dracut version compat runtime check
Update check_dracut_module_versions_compatible_to_kiwi to match with new dracut module dirs which have changed due to recommended dracut module ordering for out-of-tree modules.
1 parent 9f4d7b9 commit 946e913

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

kiwi/runtime_checker.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -680,22 +680,22 @@ def check_dracut_module_versions_compatible_to_kiwi(
680680
{1}
681681
''')
682682
kiwi_dracut_modules = {
683-
'90kiwi-dump': dracut_module_type(
683+
'55kiwi-dump': dracut_module_type(
684684
'dracut-kiwi-oem-dump', '9.20.1'
685685
),
686-
'90kiwi-live': dracut_module_type(
686+
'55kiwi-live': dracut_module_type(
687687
'dracut-kiwi-live', '9.20.1'
688688
),
689-
'90kiwi-overlay': dracut_module_type(
689+
'55kiwi-overlay': dracut_module_type(
690690
'dracut-kiwi-overlay', '9.20.1'
691691
),
692-
'90kiwi-repart': dracut_module_type(
692+
'55kiwi-repart': dracut_module_type(
693693
'dracut-kiwi-oem-repart', '9.20.1'
694694
),
695-
'99kiwi-dump-reboot': dracut_module_type(
695+
'59kiwi-dump-reboot': dracut_module_type(
696696
'dracut-kiwi-oem-dump', '9.20.1'
697697
),
698-
'99kiwi-lib': dracut_module_type(
698+
'59kiwi-lib': dracut_module_type(
699699
'dracut-kiwi-lib', '9.20.1'
700700
)
701701
}

test/unit/runtime_checker_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_check_dracut_module_versions_compatible_to_kiwi(
107107
command = Mock()
108108
command.output = '1.2.3-1.2'
109109
mock_Command_run.return_value = command
110-
mock_os_listdir.return_value = ['90kiwi-dump']
110+
mock_os_listdir.return_value = ['55kiwi-dump']
111111
package_manager = Mock()
112112
package_manager.return_value = 'zypper'
113113
self.xml_state.get_package_manager = package_manager

0 commit comments

Comments
 (0)