Skip to content

Skip kiwi-repart module in install ISOs #2871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2025
Merged

Skip kiwi-repart module in install ISOs #2871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a9c464
Skip kiwi-repart module in install ISOs
schaefi Aug 5, 2025
5e03e05
Do not clobber initialize method
schaefi Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ function get_remote_image_source_files {
#--------------------------------------
setup_debug

initialize
lib_initialize

udev_pending

Expand Down
4 changes: 2 additions & 2 deletions dracut/modules.d/99kiwi-dump-reboot/kiwi-dump-reboot-system.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
type initialize >/dev/null 2>&1 || . /lib/kiwi-lib.sh
type lib_initialize >/dev/null 2>&1 || . /lib/kiwi-lib.sh
type report_and_quit >/dev/null 2>&1 || . /lib/kiwi-dump-image.sh
type get_selected_disk >/dev/null 2>&1 || . /lib/kiwi-dump-image.sh
type run_dialog >/dev/null 2>&1 || . /lib/kiwi-dialog-lib.sh
Expand Down Expand Up @@ -73,7 +73,7 @@ function boot_installed_system {
#======================================
# Reboot into system
#--------------------------------------
initialize
lib_initialize

if getargbool 0 rd.kiwi.ramdisk; then
# For ramdisk deployment a kexec boot is not possible as it
Expand Down
2 changes: 1 addition & 1 deletion dracut/modules.d/99kiwi-lib/kiwi-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ function bool {
fi
}

function initialize {
function lib_initialize {
# """
# Source profile variables into runtime environment
# The method will exit from the initrd if the profile
Expand Down
2 changes: 2 additions & 0 deletions kiwi/builder/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ def _create_pxe_install_kernel_and_initrd(self) -> None:
if self.initrd_system == 'dracut':
self.boot_image_task.include_module('kiwi-dump')
self.boot_image_task.include_module('kiwi-dump-reboot')
self.boot_image_task.omit_module('kiwi-repart')
if self.root_filesystem_is_multipath is False:
self.boot_image_task.omit_module('multipath')
for mod in self.xml_state.get_installmedia_initrd_modules('add'):
Expand Down Expand Up @@ -452,6 +453,7 @@ def _create_iso_install_kernel_and_initrd(self) -> None:
if self.initrd_system == 'dracut':
self.boot_image_task.include_module('kiwi-dump')
self.boot_image_task.include_module('kiwi-dump-reboot')
self.boot_image_task.omit_module('kiwi-repart')
if self.root_filesystem_is_multipath is False:
self.boot_image_task.omit_module('multipath')
for mod in self.xml_state.get_installmedia_initrd_modules('add'):
Expand Down
5 changes: 3 additions & 2 deletions test/unit/builder/install_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ def side_effect(prefix, path):
self.boot_image_task.include_driver.assert_any_call('driver1')
self.boot_image_task.include_driver.assert_any_call('driver2')
assert self.boot_image_task.omit_module.call_args_list == [
call('multipath'), call('module1'), call('module2')
call('kiwi-repart'), call('multipath'),
call('module1'), call('module2')
]
self.boot_image_task.set_static_modules.assert_called_once_with(
['module1', 'module2']
Expand Down Expand Up @@ -450,7 +451,7 @@ def test_create_install_pxe_archive(
self.boot_image_task.include_driver.assert_any_call('driver1')
self.boot_image_task.include_driver.assert_any_call('driver2')
assert self.boot_image_task.omit_module.call_args_list == [
call('multipath'), call('module1'), call('module2')
call('kiwi-repart'), call('multipath'), call('module1'), call('module2')
]
self.boot_image_task.set_static_modules.assert_called_once_with(
['module1', 'module2']
Expand Down