Skip to content

Commit 0443435

Browse files
authored
Merge pull request #2874 from OSInside/fix_exclude_list_for_live_images
Fix exclude list for live image builds
2 parents 9b287e8 + e3994fb commit 0443435

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

kiwi/builder/live.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,10 @@ def create(self) -> Result:
320320
) as live_container_image:
321321
container_image = Temporary().new_file()
322322
live_container_image.create_on_file(
323-
container_image.name
323+
filename=container_image.name,
324+
exclude=Defaults.
325+
get_exclude_list_for_root_data_sync() + Defaults.
326+
get_exclude_list_from_custom_exclude_files(self.root_dir)
324327
)
325328
Path.create(self.media_dir.name + '/LiveOS')
326329
os.chmod(container_image.name, 0o644)

test/unit/builder/live_test.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,13 @@ def side_effect():
267267
)
268268
]
269269

270-
filesystem.create_on_file.assert_called_once_with('kiwi-tmpfile')
270+
filesystem.create_on_file.assert_called_once_with(
271+
filename='kiwi-tmpfile',
272+
exclude=[
273+
'image', '.kconfig', 'run/*', 'tmp/*',
274+
'.buildenv', 'var/cache/kiwi'
275+
]
276+
)
271277

272278
assert mock_shutil.copy.call_args_list == [
273279
call('kiwi-tmpfile', 'temp_media_dir/LiveOS/squashfs.img')

0 commit comments

Comments
 (0)