almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed use of fscreateoptions for iso type

Browse Source 
The information for fscreateoptions was not passed along to the
tooling if a custom filesystem attribute was specified.
This Fixes #2681
This commit is contained in:
Marcus Schäfer 2024-11-25 16:30:53 +01:00
parent c50183f220
commit 71608c1122
No known key found for this signature in database
GPG Key ID: A16C1128698C8CAC
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-tests/x86/tumbleweed/test-image-live/appliance.kiwi
View File

@ -33,7 +33,7 @@
</type>
</preferences>
<preferences profiles="EroFS">
<type image="iso" flags="overlay" firmware="uefi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="xfs" hybridpersistent="true" mediacheck="true" filesystem="erofs">
<type image="iso" flags="overlay" firmware="uefi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="xfs" hybridpersistent="true" mediacheck="true" filesystem="erofs" fscreateoptions="-Ededupe,all-fragments -C 65536">
<bootloader name="grub2" console="serial" timeout="10"/>
</type>
</preferences>

13
kiwi/builder/live.py
View File

@ -301,17 +301,20 @@ class LiveImageBuilder:
)
else:
# Put the root filesystem into SquashFS directly
with FileSystem.new(
name=root_filesystem,
device_provider=DeviceProvider(),
root_dir=self.root_dir + os.sep,
custom_args={
filesystem_custom_parameters.update(
{
'compression':
self.xml_state.build_type.get_squashfscompression()
} if root_filesystem == 'squashfs' else {
'compression':
self.xml_state.build_type.get_erofscompression()
}
)
with FileSystem.new(
name=root_filesystem,
device_provider=DeviceProvider(),
root_dir=self.root_dir + os.sep,
custom_args=filesystem_custom_parameters
) as live_container_image:
container_image = Temporary().new_file()
live_container_image.create_on_file(

6
test/unit/builder/live_test.py
View File

@ -257,7 +257,11 @@ class TestLiveImageBuilder:
device_provider=mock_DeviceProvider.return_value,
name='squashfs',
root_dir='root_dir/',
custom_args={'compression': 'lzo'}
custom_args={
'mount_options': ['async'],
'create_options': ['-O', 'option'],
'compression': 'lzo'
}
)
]