Skip to content

Fix profile env variable name regression #2740

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
schaefi merged 1 commit into from
Feb 26, 2025
Merged

Fix profile env variable name regression #2740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions kiwi/system/profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ def _type_to_profile(self):
self.xml_state.get_build_type_bootloader_console()[0] or 'default',
self.xml_state.get_build_type_bootloader_console()[1] or 'default'
)
self.dot_profile['kiwi_btrfs_root_is_snapshot'] = \
type_section.get_btrfs_root_is_snapper_snapshot()
self.dot_profile['kiwi_btrfs_root_is_snapper_snapshot'] = \
type_section.get_btrfs_root_is_snapper_snapshot()
self.dot_profile['kiwi_gpt_hybrid_mbr'] = \
Expand Down
2 changes: 2 additions & 0 deletions test/unit/system/profile_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def test_create_live(self, mock_which):
'kiwi_firmware': 'bios',
'kiwi_bootloader': 'grub2',
'kiwi_bootloader_console': 'default:default',
'kiwi_btrfs_root_is_snapshot': None,
'kiwi_btrfs_root_is_snapper_snapshot': None,
'kiwi_gpt_hybrid_mbr': None,
'kiwi_devicepersistency': None,
Expand Down Expand Up @@ -137,6 +138,7 @@ def test_create_oem(self, mock_which):
'kiwi_ramonly': True,
'kiwi_initrd_system': 'dracut',
'kiwi_install_volid': 'INSTALL',
'kiwi_btrfs_root_is_snapshot': None,
'kiwi_btrfs_root_is_snapper_snapshot': None,
'kiwi_gpt_hybrid_mbr': None,
'kiwi_showlicense': None,
Expand Down
1 change: 1 addition & 0 deletions test/unit/tasks/image_info_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ def test_process_image_info_print_kiwi_env(self, mock_out):
('kiwi_bootloader_console', 'default:default'),
('kiwi_bootprofile', ''),
('kiwi_btrfs_root_is_snapper_snapshot', ''),
('kiwi_btrfs_root_is_snapshot', ''),
('kiwi_cmdline', ''),
('kiwi_compressed', ''),
('kiwi_delete', ''),
Expand Down