From 2edcfed120d02641a5f251f436e5d3adea784c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Mon, 13 Jan 2025 09:45:32 +0100 Subject: [PATCH 1/2] Rename btrfs_root_is_snapshot Rename btrfs_root_is_snapshot to btrfs_root_is_snapper_snapshot. This happens in preparation for the changes suggested in #2697 where we want to get rid of snapper specific btrfs code which will be available in snapper natively soon. To make sure a btrfs layout specific to snapper(and SUSE), the implicitly used attribute named btrfs_root_is_snapshot now becomes explicit and its new name will indicate that snapper sits behind it. Along with the rename a XSLT stylesheet to automatically convert the old name into the new name for schema v8.3 will be performed. --- doc/source/image_description/elements.rst | 9 ++-- kiwi/boot/image/base.py | 2 +- kiwi/bootloader/config/grub2.py | 2 +- kiwi/builder/disk.py | 16 +++---- kiwi/schema/kiwi.rnc | 17 +++---- kiwi/schema/kiwi.rng | 17 +++---- kiwi/system/profile.py | 6 +-- kiwi/volume_manager/btrfs.py | 33 ++++++------- kiwi/xml_parse.py | 24 +++++----- kiwi/xsl/convert82to83.xsl | 57 +++++++++++++++++++++++ kiwi/xsl/master.xsl | 7 ++- test/unit/bootloader/config/base_test.py | 4 +- test/unit/system/profile_test.py | 4 +- test/unit/tasks/image_info_test.py | 2 +- test/unit/volume_manager/btrfs_test.py | 26 +++++------ 15 files changed, 146 insertions(+), 80 deletions(-) create mode 100644 kiwi/xsl/convert82to83.xsl diff --git a/doc/source/image_description/elements.rst b/doc/source/image_description/elements.rst index c41f7712d11..560b1f2ebb6 100644 --- a/doc/source/image_description/elements.rst +++ b/doc/source/image_description/elements.rst @@ -448,17 +448,18 @@ btrfs_root_is_subvolume="true|false": By default the creation of a toplevel volume is set to: `true` -btrfs_root_is_snapshot="true|false": +btrfs_root_is_snapper_snapshot="true|false": Boolean parameter that tells {kiwi} to install - the system into a btrfs snapshot. The snapshot layout is compatible with - snapper. By default snapshots are turned off. + the system into a btrfs snapshot. The snapshot layout is compatible + with the snapper management toolkit and follows a concept by SUSE. + By default snapshots are turned off. btrfs_root_is_readonly_snapshot="true|false": Boolean parameter notifying {kiwi} that the btrfs root filesystem snapshot has to made read-only. if this option is set to true, the root filesystem snapshot it will be turned into read-only mode, once all data has been placed to it. The option is only - effective if `btrfs_root_is_snapshot` is also set to true. By default the + effective if `btrfs_root_is_snapper_snapshot` is also set to true. By default the root filesystem snapshot is writable. bootstrap_package="package_name": diff --git a/kiwi/boot/image/base.py b/kiwi/boot/image/base.py index 41669b5eb7b..55bb0e20eeb 100644 --- a/kiwi/boot/image/base.py +++ b/kiwi/boot/image/base.py @@ -359,7 +359,7 @@ def import_system_description_elements(self) -> None: type_attributes = [ 'bootkernel', 'bootprofile', - 'btrfs_root_is_snapshot', + 'btrfs_root_is_snapper_snapshot', 'gpt_hybrid_mbr', 'devicepersistency', 'filesystem', diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py index 9c69028a6bc..634a071fd40 100644 --- a/kiwi/bootloader/config/grub2.py +++ b/kiwi/bootloader/config/grub2.py @@ -800,7 +800,7 @@ def _setup_default_grub(self): ) if os.path.exists(os.sep.join([self.root_dir, theme_background])): grub_default_entries['GRUB_BACKGROUND'] = theme_background - if self.xml_state.build_type.get_btrfs_root_is_snapshot(): + if self.xml_state.build_type.get_btrfs_root_is_snapper_snapshot(): grub_default_entries['SUSE_BTRFS_SNAPSHOT_BOOTING'] = 'true' if self.custom_args.get('crypto_disk'): grub_default_entries['GRUB_ENABLE_CRYPTODISK'] = 'y' diff --git a/kiwi/builder/disk.py b/kiwi/builder/disk.py index 914c6544059..32798dd5bfc 100644 --- a/kiwi/builder/disk.py +++ b/kiwi/builder/disk.py @@ -226,8 +226,8 @@ def __init__( self.custom_root_creation_args, 'root_label': self.disk_setup.get_root_label(), - 'root_is_snapshot': - self.xml_state.build_type.get_btrfs_root_is_snapshot(), + 'root_is_snapper_snapshot': + self.xml_state.build_type.get_btrfs_root_is_snapper_snapshot(), 'root_is_readonly_snapshot': self.xml_state.build_type.get_btrfs_root_is_readonly_snapshot(), 'root_is_subvolume': @@ -1308,14 +1308,14 @@ def _write_generic_fstab( self, device_map: Dict, setup: SystemSetup, system: Optional[Union[FileSystemBase, VolumeManagerBase]] ) -> None: - root_is_snapshot = \ - self.xml_state.build_type.get_btrfs_root_is_snapshot() + root_is_snapper_snapshot = \ + self.xml_state.build_type.get_btrfs_root_is_snapper_snapshot() root_is_readonly_snapshot = \ self.xml_state.build_type.get_btrfs_root_is_readonly_snapshot() fs_check_interval = '0 1' custom_root_mount_args = list(self.custom_root_mount_args) - if root_is_snapshot and root_is_readonly_snapshot: + if root_is_snapper_snapshot and root_is_readonly_snapshot: custom_root_mount_args += ['ro'] fs_check_interval = '0 0' @@ -1788,11 +1788,11 @@ def _setup_property_root_is_readonly_snapshot( self, system: Union[FileSystemBase, VolumeManagerBase] ) -> None: if self.volume_manager_name: - root_is_snapshot = \ - self.xml_state.build_type.get_btrfs_root_is_snapshot() + root_is_snapper_snapshot = \ + self.xml_state.build_type.get_btrfs_root_is_snapper_snapshot() root_is_readonly_snapshot = \ self.xml_state.build_type.get_btrfs_root_is_readonly_snapshot() - if root_is_snapshot and root_is_readonly_snapshot: + if root_is_snapper_snapshot and root_is_readonly_snapshot: log.info( 'Setting root filesystem into read-only mode' ) diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc index cfcb24dfb7a..f2fbad65f5c 100644 --- a/kiwi/schema/kiwi.rnc +++ b/kiwi/schema/kiwi.rnc @@ -66,7 +66,7 @@ div { attribute xsi:schemaLocation { xsd:anyURI } k.image.schemaversion.attribute = ## The allowed Schema version (fixed value) - attribute schemaversion { "8.2" } + attribute schemaversion { "8.3" } k.image.id = ## An identification number which is represented in a file ## named /etc/ImageID @@ -1524,20 +1524,21 @@ div { sch:param [ name = "attr" value = "btrfs_root_is_subvolume" ] sch:param [ name = "types" value = "oem" ] ] - k.type.btrfs_root_is_snapshot.attribute = + k.type.btrfs_root_is_snapper_snapshot.attribute = ## Tell kiwi to install the system into a btrfs snapshot ## The snapshot layout is compatible with the snapper management - ## toolkit. By default no snapshots are used - attribute btrfs_root_is_snapshot { xsd:boolean } - >> sch:pattern [ id = "btrfs_root_is_snapshot" is-a = "image_type" - sch:param [ name = "attr" value = "btrfs_root_is_snapshot" ] + ## toolkit and follows a concept by SUSE. + ## By default no snapshots are used + attribute btrfs_root_is_snapper_snapshot { xsd:boolean } + >> sch:pattern [ id = "btrfs_root_is_snapper_snapshot" is-a = "image_type" + sch:param [ name = "attr" value = "btrfs_root_is_snapper_snapshot" ] sch:param [ name = "types" value = "oem" ] ] k.type.btrfs_root_is_readonly_snapshot.attribute = ## Tell kiwi to set the btrfs root filesystem snapshot read-only ## Once all data has been placed to the root filesystem snapshot ## it will be turned into read-only mode if this option is set to - ## true. The option is only effective if btrfs_root_is_snapshot + ## true. The option is only effective if btrfs_root_is_snapper_snapshot ## is also set to true. By default the root filesystem snapshot ## is writable attribute btrfs_root_is_readonly_snapshot { xsd:boolean } @@ -2354,7 +2355,7 @@ div { k.type.dosparttable_extended_layout.attribute? & k.type.bootprofile.attribute? & k.type.btrfs_quota_groups.attribute? & - k.type.btrfs_root_is_snapshot.attribute? & + k.type.btrfs_root_is_snapper_snapshot.attribute? & k.type.btrfs_root_is_subvolume.attribute? & k.type.btrfs_set_default_volume.attribute? & k.type.btrfs_root_is_readonly_snapshot.attribute? & diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng index 50202d58895..aa7b4b0f51d 100644 --- a/kiwi/schema/kiwi.rng +++ b/kiwi/schema/kiwi.rng @@ -150,7 +150,7 @@ second the location of the XSD Schema The allowed Schema version (fixed value) - 8.2 + 8.3 @@ -2255,15 +2255,16 @@ By default the creation of a root subvolume is set to: true - - + + Tell kiwi to install the system into a btrfs snapshot The snapshot layout is compatible with the snapper management -toolkit. By default no snapshots are used +toolkit and follows a concept by SUSE. +By default no snapshots are used - - + + @@ -2272,7 +2273,7 @@ toolkit. By default no snapshots are used Tell kiwi to set the btrfs root filesystem snapshot read-only Once all data has been placed to the root filesystem snapshot it will be turned into read-only mode if this option is set to -true. The option is only effective if btrfs_root_is_snapshot +true. The option is only effective if btrfs_root_is_snapper_snapshot is also set to true. By default the root filesystem snapshot is writable @@ -3405,7 +3406,7 @@ kiwi-ng result bundle ... - + diff --git a/kiwi/system/profile.py b/kiwi/system/profile.py index 0e3faa349d6..643b44d1ff8 100644 --- a/kiwi/system/profile.py +++ b/kiwi/system/profile.py @@ -289,7 +289,7 @@ def _type_to_profile(self): # kiwi_fsmountoptions # kiwi_bootprofile # kiwi_vga - # kiwi_btrfs_root_is_snapshot + # kiwi_btrfs_root_is_snapper_snapshot # kiwi_startsector type_section = self.xml_state.build_type self.dot_profile['kiwi_type'] = \ @@ -322,8 +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_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'] = \ type_section.get_gpt_hybrid_mbr() self.dot_profile['kiwi_devicepersistency'] = \ diff --git a/kiwi/volume_manager/btrfs.py b/kiwi/volume_manager/btrfs.py index 2a3b39ea0c3..00ec3ebd26b 100644 --- a/kiwi/volume_manager/btrfs.py +++ b/kiwi/volume_manager/btrfs.py @@ -65,8 +65,8 @@ def post_init(self, custom_args): self.custom_args = {} if 'root_label' not in self.custom_args: self.custom_args['root_label'] = 'ROOT' - if 'root_is_snapshot' not in self.custom_args: - self.custom_args['root_is_snapshot'] = False + if 'root_is_snapper_snapshot' not in self.custom_args: + self.custom_args['root_is_snapper_snapshot'] = False if 'btrfs_default_volume_requested' not in self.custom_args: self.custom_args['btrfs_default_volume_requested'] = True if 'root_is_readonly_snapshot' not in self.custom_args: @@ -86,11 +86,11 @@ def post_init(self, custom_args): self.root_volume_name = volume.name self.default_volume_name = self.root_volume_name - if self.custom_args['root_is_snapshot'] and \ + if self.custom_args['root_is_snapper_snapshot'] and \ self.root_volume_name == '/': - log.warning('root_is_snapshot requires a toplevel sub-volume') - log.warning('root_is_snapshot has been disabled') - self.custom_args['root_is_snapshot'] = False + log.warning('root_is_snapper_snapshot requires a toplevel sub-volume') + log.warning('root_is_snapper_snapshot has been disabled') + self.custom_args['root_is_snapper_snapshot'] = False self.subvol_mount_list = [] self.toplevel_mount = None @@ -134,7 +134,7 @@ def setup(self, name=None): Command.run( ['btrfs', 'subvolume', 'create', root_volume] ) - if self.custom_args['root_is_snapshot']: + if self.custom_args['root_is_snapper_snapshot']: snapshot_volume = self.mountpoint + \ f'/{self.root_volume_name}/.snapshots' Command.run( @@ -233,7 +233,8 @@ def create_volumes(self, filesystem_name): ) volume_mountpoint = toplevel - root_is_snapshot = self.custom_args['root_is_snapshot'] + root_is_snapper_snapshot = \ + self.custom_args['root_is_snapper_snapshot'] attributes = { 'parent': volume.parent or '', @@ -244,7 +245,7 @@ def create_volumes(self, filesystem_name): ).lstrip(os.sep), 'subvol_name': volume.name } - if root_is_snapshot: + if root_is_snapper_snapshot: volume_mountpoint = self.mountpoint + \ f'/{self.root_volume_name}/.snapshots/1/snapshot/' attributes = { @@ -263,7 +264,7 @@ def create_volumes(self, filesystem_name): os.sep.join( [ volume_mountpoint, - self.root_volume_name if not root_is_snapshot else '', + self.root_volume_name if not root_is_snapper_snapshot else '', volume.realpath ] ) @@ -397,7 +398,7 @@ def get_mountpoint(self) -> str: sync_target: List[str] = [self.mountpoint] if self.root_volume_name != '/': sync_target.append(self.root_volume_name) - if self.custom_args.get('root_is_snapshot'): + if self.custom_args.get('root_is_snapper_snapshot'): sync_target.extend(['.snapshots', '1', 'snapshot']) return os.path.join(*sync_target) @@ -412,7 +413,7 @@ def sync_data(self, exclude=None): """ if self.toplevel_mount: sync_target = self.get_mountpoint() - if self.custom_args['root_is_snapshot']: + if self.custom_args['root_is_snapper_snapshot']: self._create_snapshot_info( ''.join( [ @@ -426,18 +427,18 @@ def sync_data(self, exclude=None): options=Defaults.get_sync_options(), exclude=exclude ) if self.custom_args['quota_groups'] and \ - self.custom_args['root_is_snapshot']: + self.custom_args['root_is_snapper_snapshot']: self._create_snapper_quota_configuration() def set_property_readonly_root(self): """ Sets the root volume to be a readonly filesystem """ - root_is_snapshot = \ - self.custom_args['root_is_snapshot'] + root_is_snapper_snapshot = \ + self.custom_args['root_is_snapper_snapshot'] root_is_readonly_snapshot = \ self.custom_args['root_is_readonly_snapshot'] - if root_is_snapshot and root_is_readonly_snapshot: + if root_is_snapper_snapshot and root_is_readonly_snapshot: sync_target = self.get_mountpoint() Command.run( ['btrfs', 'property', 'set', sync_target, 'ro', 'true'] diff --git a/kiwi/xml_parse.py b/kiwi/xml_parse.py index 43a09bfd538..0fe4104b4d5 100644 --- a/kiwi/xml_parse.py +++ b/kiwi/xml_parse.py @@ -3362,7 +3362,7 @@ class type_(GeneratedsSuper): """The Image Type of the Logical Extend""" subclass = None superclass = None - def __init__(self, boot=None, bootfilesystem=None, firmware=None, bootkernel=None, bootpartition=None, bootpartsize=None, efipartsize=None, efifatimagesize=None, eficsm=None, efiparttable=None, dosparttable_extended_layout=None, bootprofile=None, btrfs_quota_groups=None, btrfs_root_is_snapshot=None, btrfs_root_is_subvolume=None, btrfs_set_default_volume=None, btrfs_root_is_readonly_snapshot=None, compressed=None, devicepersistency=None, editbootconfig=None, editbootinstall=None, filesystem=None, flags=None, enclave_format=None, format=None, formatoptions=None, fsmountoptions=None, fscreateoptions=None, squashfscompression=None, erofscompression=None, gcelicense=None, hybridpersistent=None, hybridpersistent_filesystem=None, gpt_hybrid_mbr=None, force_mbr=None, initrd_system=None, image=None, metadata_path=None, installboot=None, install_continue_on_timeout=None, installprovidefailsafe=None, installiso=None, installstick=None, installpxe=None, mediacheck=None, kernelcmdline=None, luks=None, luks_version=None, luksOS=None, luks_randomize=None, luks_pbkdf=None, mdraid=None, overlayroot=None, overlayroot_write_partition=None, overlayroot_readonly_partsize=None, verity_blocks=None, embed_verity_metadata=None, standalone_integrity=None, embed_integrity_metadata=None, integrity_legacy_hmac=None, integrity_metadata_key_description=None, integrity_keyfile=None, primary=None, ramonly=None, rootfs_label=None, spare_part=None, spare_part_mountpoint=None, spare_part_fs=None, spare_part_fs_attributes=None, spare_part_is_last=None, target_blocksize=None, target_removable=None, selinux_policy=None, vga=None, vhdfixedtag=None, volid=None, application_id=None, wwid_wait_timeout=None, derived_from=None, delta_root=None, provide_system_files=None, require_system_files=None, ensure_empty_tmpdirs=None, xen_server=None, publisher=None, disk_start_sector=None, root_clone=None, boot_clone=None, bundle_format=None, bootloader=None, containerconfig=None, machine=None, oemconfig=None, size=None, systemdisk=None, partitions=None, vagrantconfig=None, installmedia=None, luksformat=None): + def __init__(self, boot=None, bootfilesystem=None, firmware=None, bootkernel=None, bootpartition=None, bootpartsize=None, efipartsize=None, efifatimagesize=None, eficsm=None, efiparttable=None, dosparttable_extended_layout=None, bootprofile=None, btrfs_quota_groups=None, btrfs_root_is_snapper_snapshot=None, btrfs_root_is_subvolume=None, btrfs_set_default_volume=None, btrfs_root_is_readonly_snapshot=None, compressed=None, devicepersistency=None, editbootconfig=None, editbootinstall=None, filesystem=None, flags=None, enclave_format=None, format=None, formatoptions=None, fsmountoptions=None, fscreateoptions=None, squashfscompression=None, erofscompression=None, gcelicense=None, hybridpersistent=None, hybridpersistent_filesystem=None, gpt_hybrid_mbr=None, force_mbr=None, initrd_system=None, image=None, metadata_path=None, installboot=None, install_continue_on_timeout=None, installprovidefailsafe=None, installiso=None, installstick=None, installpxe=None, mediacheck=None, kernelcmdline=None, luks=None, luks_version=None, luksOS=None, luks_randomize=None, luks_pbkdf=None, mdraid=None, overlayroot=None, overlayroot_write_partition=None, overlayroot_readonly_partsize=None, verity_blocks=None, embed_verity_metadata=None, standalone_integrity=None, embed_integrity_metadata=None, integrity_legacy_hmac=None, integrity_metadata_key_description=None, integrity_keyfile=None, primary=None, ramonly=None, rootfs_label=None, spare_part=None, spare_part_mountpoint=None, spare_part_fs=None, spare_part_fs_attributes=None, spare_part_is_last=None, target_blocksize=None, target_removable=None, selinux_policy=None, vga=None, vhdfixedtag=None, volid=None, application_id=None, wwid_wait_timeout=None, derived_from=None, delta_root=None, provide_system_files=None, require_system_files=None, ensure_empty_tmpdirs=None, xen_server=None, publisher=None, disk_start_sector=None, root_clone=None, boot_clone=None, bundle_format=None, bootloader=None, containerconfig=None, machine=None, oemconfig=None, size=None, systemdisk=None, partitions=None, vagrantconfig=None, installmedia=None, luksformat=None): self.original_tagname_ = None self.boot = _cast(None, boot) self.bootfilesystem = _cast(None, bootfilesystem) @@ -3377,7 +3377,7 @@ def __init__(self, boot=None, bootfilesystem=None, firmware=None, bootkernel=Non self.dosparttable_extended_layout = _cast(bool, dosparttable_extended_layout) self.bootprofile = _cast(None, bootprofile) self.btrfs_quota_groups = _cast(bool, btrfs_quota_groups) - self.btrfs_root_is_snapshot = _cast(bool, btrfs_root_is_snapshot) + self.btrfs_root_is_snapper_snapshot = _cast(bool, btrfs_root_is_snapper_snapshot) self.btrfs_root_is_subvolume = _cast(bool, btrfs_root_is_subvolume) self.btrfs_set_default_volume = _cast(bool, btrfs_set_default_volume) self.btrfs_root_is_readonly_snapshot = _cast(bool, btrfs_root_is_readonly_snapshot) @@ -3580,8 +3580,8 @@ def get_bootprofile(self): return self.bootprofile def set_bootprofile(self, bootprofile): self.bootprofile = bootprofile def get_btrfs_quota_groups(self): return self.btrfs_quota_groups def set_btrfs_quota_groups(self, btrfs_quota_groups): self.btrfs_quota_groups = btrfs_quota_groups - def get_btrfs_root_is_snapshot(self): return self.btrfs_root_is_snapshot - def set_btrfs_root_is_snapshot(self, btrfs_root_is_snapshot): self.btrfs_root_is_snapshot = btrfs_root_is_snapshot + def get_btrfs_root_is_snapper_snapshot(self): return self.btrfs_root_is_snapper_snapshot + def set_btrfs_root_is_snapper_snapshot(self, btrfs_root_is_snapper_snapshot): self.btrfs_root_is_snapper_snapshot = btrfs_root_is_snapper_snapshot def get_btrfs_root_is_subvolume(self): return self.btrfs_root_is_subvolume def set_btrfs_root_is_subvolume(self, btrfs_root_is_subvolume): self.btrfs_root_is_subvolume = btrfs_root_is_subvolume def get_btrfs_set_default_volume(self): return self.btrfs_set_default_volume @@ -3858,9 +3858,9 @@ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_=' if self.btrfs_quota_groups is not None and 'btrfs_quota_groups' not in already_processed: already_processed.add('btrfs_quota_groups') outfile.write(' btrfs_quota_groups="%s"' % self.gds_format_boolean(self.btrfs_quota_groups, input_name='btrfs_quota_groups')) - if self.btrfs_root_is_snapshot is not None and 'btrfs_root_is_snapshot' not in already_processed: - already_processed.add('btrfs_root_is_snapshot') - outfile.write(' btrfs_root_is_snapshot="%s"' % self.gds_format_boolean(self.btrfs_root_is_snapshot, input_name='btrfs_root_is_snapshot')) + if self.btrfs_root_is_snapper_snapshot is not None and 'btrfs_root_is_snapper_snapshot' not in already_processed: + already_processed.add('btrfs_root_is_snapper_snapshot') + outfile.write(' btrfs_root_is_snapper_snapshot="%s"' % self.gds_format_boolean(self.btrfs_root_is_snapper_snapshot, input_name='btrfs_root_is_snapper_snapshot')) if self.btrfs_root_is_subvolume is not None and 'btrfs_root_is_subvolume' not in already_processed: already_processed.add('btrfs_root_is_subvolume') outfile.write(' btrfs_root_is_subvolume="%s"' % self.gds_format_boolean(self.btrfs_root_is_subvolume, input_name='btrfs_root_is_subvolume')) @@ -4209,13 +4209,13 @@ def buildAttributes(self, node, attrs, already_processed): self.btrfs_quota_groups = False else: raise_parse_error(node, 'Bad boolean attribute') - value = find_attr_value_('btrfs_root_is_snapshot', node) - if value is not None and 'btrfs_root_is_snapshot' not in already_processed: - already_processed.add('btrfs_root_is_snapshot') + value = find_attr_value_('btrfs_root_is_snapper_snapshot', node) + if value is not None and 'btrfs_root_is_snapper_snapshot' not in already_processed: + already_processed.add('btrfs_root_is_snapper_snapshot') if value in ('true', '1'): - self.btrfs_root_is_snapshot = True + self.btrfs_root_is_snapper_snapshot = True elif value in ('false', '0'): - self.btrfs_root_is_snapshot = False + self.btrfs_root_is_snapper_snapshot = False else: raise_parse_error(node, 'Bad boolean attribute') value = find_attr_value_('btrfs_root_is_subvolume', node) diff --git a/kiwi/xsl/convert82to83.xsl b/kiwi/xsl/convert82to83.xsl new file mode 100644 index 00000000000..480c8d21efb --- /dev/null +++ b/kiwi/xsl/convert82to83.xsl @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + Changed attribute schemaversion + to schemaversion from + 8.2 to 8.3. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kiwi/xsl/master.xsl b/kiwi/xsl/master.xsl index dfb37219524..5b7f560e0fa 100644 --- a/kiwi/xsl/master.xsl +++ b/kiwi/xsl/master.xsl @@ -11,6 +11,7 @@ + @@ -40,8 +41,12 @@ + + + + diff --git a/test/unit/bootloader/config/base_test.py b/test/unit/bootloader/config/base_test.py index 200a15cde0f..531bce6d600 100644 --- a/test/unit/bootloader/config/base_test.py +++ b/test/unit/bootloader/config/base_test.py @@ -232,7 +232,7 @@ def test_get_boot_path_btrfs_boot_is_a_volume_error( @patch('kiwi.bootloader.config.base.DiskSetup') @patch('kiwi.xml_parse.type_.get_filesystem') - @patch('kiwi.xml_parse.type_.get_btrfs_root_is_snapshot') + @patch('kiwi.xml_parse.type_.get_btrfs_root_is_snapper_snapshot') @patch('kiwi.xml_state.XMLState.get_volumes') def test_get_boot_path_btrfs_no_snapshot( self, mock_volumes, mock_snapshot, mock_fs, mock_disk_setup @@ -252,7 +252,7 @@ def test_get_boot_path_btrfs_no_snapshot( @patch('kiwi.bootloader.config.base.DiskSetup') @patch('kiwi.xml_parse.type_.get_filesystem') - @patch('kiwi.xml_parse.type_.get_btrfs_root_is_snapshot') + @patch('kiwi.xml_parse.type_.get_btrfs_root_is_snapper_snapshot') @patch('kiwi.xml_state.XMLState.get_volumes') def test_get_boot_path_btrfs_snapshot( self, mock_volumes, mock_snapshot, mock_fs, mock_disk_setup diff --git a/test/unit/system/profile_test.py b/test/unit/system/profile_test.py index 8d6efa2add3..73fe8adb0df 100644 --- a/test/unit/system/profile_test.py +++ b/test/unit/system/profile_test.py @@ -49,7 +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, 'kiwi_installboot': None, @@ -137,7 +137,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, 'kiwi_splash_theme': 'openSUSE', diff --git a/test/unit/tasks/image_info_test.py b/test/unit/tasks/image_info_test.py index 7e674d4496d..32bd84619cb 100644 --- a/test/unit/tasks/image_info_test.py +++ b/test/unit/tasks/image_info_test.py @@ -150,7 +150,7 @@ def test_process_image_info_print_kiwi_env(self, mock_out): ('kiwi_bootloader', 'grub2'), ('kiwi_bootloader_console', 'default:default'), ('kiwi_bootprofile', ''), - ('kiwi_btrfs_root_is_snapshot', ''), + ('kiwi_btrfs_root_is_snapper_snapshot', ''), ('kiwi_cmdline', ''), ('kiwi_compressed', ''), ('kiwi_delete', ''), diff --git a/test/unit/volume_manager/btrfs_test.py b/test/unit/volume_manager/btrfs_test.py index 94c83602025..bfb8d3f7b52 100644 --- a/test/unit/volume_manager/btrfs_test.py +++ b/test/unit/volume_manager/btrfs_test.py @@ -74,7 +74,7 @@ def test_post_init(self): self.volume_manager.post_init({'some-arg': 'some-val'}) assert self.volume_manager.custom_args['some-arg'] == 'some-val' - def test_post_init_root_is_snapshot_without_root_volume(self): + def test_post_init_root_is_snapper_snapshot_without_root_volume(self): self.volume_manager.volumes = [ volume_type( name='/', parent='', size='freespace:100', realpath='/', @@ -82,8 +82,8 @@ def test_post_init_root_is_snapshot_without_root_volume(self): attributes=[], is_root_volume=True ) ] - self.volume_manager.post_init({'root_is_snapshot': True}) - assert self.volume_manager.custom_args['root_is_snapshot'] is False + self.volume_manager.post_init({'root_is_snapper_snapshot': True}) + assert self.volume_manager.custom_args['root_is_snapper_snapshot'] is False def test_fails_to_get_mountpoint_without_mountpoint(self): self.volume_manager.mountpoint = '' @@ -141,7 +141,7 @@ def test_setup_with_snapshot( mock_mapped_device.return_value = 'mapped_device' mock_os_exists.return_value = False mock_command.return_value = command_call - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True self.volume_manager.custom_args['quota_groups'] = True self.volume_manager.setup() @@ -197,7 +197,7 @@ def test_create_volumes_no_root_volume( volume_mount = Mock() mock_mount.return_value = volume_mount self.volume_manager.mountpoint = 'tmpdir' - self.volume_manager.custom_args['root_is_snapshot'] = False + self.volume_manager.custom_args['root_is_snapper_snapshot'] = False mock_os_exists.return_value = False self.volume_manager.root_volume_name = '/' @@ -244,7 +244,7 @@ def test_create_volumes( volume_mount = Mock() mock_mount.return_value = volume_mount self.volume_manager.mountpoint = 'tmpdir' - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True mock_os_exists.return_value = False self.volume_manager.create_volumes('btrfs') @@ -326,7 +326,7 @@ def test_get_volumes(self): 'subvol_path': '@/boot/grub2' } self.volume_manager.subvol_mount_list = [volume_mount] - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True assert self.volume_manager.get_volumes() == { '/boot/grub2': { 'volume_options': 'subvol=@/boot/grub2', @@ -348,7 +348,7 @@ def test_get_fstab(self, mock_command): 'parent': 'subvol_takes_precedence' } self.volume_manager.subvol_mount_list = [volume_mount] - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True assert self.volume_manager.get_fstab() == [ 'LABEL=id /var/tmp btrfs defaults,subvol=@/var/tmp 0 0' ] @@ -383,7 +383,7 @@ def test_mount_volumes(self, mock_path, mock_os_exists): volume_mount.get_attributes.return_value = { 'subvol_path': '@/var/tmp' } - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True self.volume_manager.subvol_mount_list = [volume_mount] self.volume_manager.mount_volumes() @@ -451,7 +451,7 @@ def exists(name): datetime.datetime.now.return_value = datetime.datetime(2016, 1, 1) self.volume_manager.toplevel_mount = Mock() self.volume_manager.mountpoint = 'tmpdir' - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True sync = Mock() mock_sync.return_value = sync @@ -515,7 +515,7 @@ def contains(key): datetime.datetime.now.return_value = datetime.datetime(2016, 1, 1) self.volume_manager.toplevel_mount = Mock() self.volume_manager.mountpoint = 'tmpdir' - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True sync = Mock() mock_sync.return_value = sync @@ -553,7 +553,7 @@ def test_sync_data_no_root_snapshot( datetime.datetime.now.return_value = datetime.datetime(2016, 1, 1) self.volume_manager.toplevel_mount = Mock() self.volume_manager.mountpoint = 'tmpdir' - self.volume_manager.custom_args['root_is_snapshot'] = False + self.volume_manager.custom_args['root_is_snapper_snapshot'] = False sync = Mock() mock_sync.return_value = sync @@ -575,7 +575,7 @@ def test_sync_data_no_root_snapshot( @patch('kiwi.volume_manager.btrfs.Command.run') def test_set_property_readonly_root(self, mock_command): self.volume_manager.mountpoint = 'tmpdir' - self.volume_manager.custom_args['root_is_snapshot'] = True + self.volume_manager.custom_args['root_is_snapper_snapshot'] = True self.volume_manager.custom_args['root_is_readonly_snapshot'] = True self.volume_manager.set_property_readonly_root() mock_command.assert_called_once_with( From 927b24f5985e169400b658c1e3d42df3ba1caffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Mon, 13 Jan 2025 10:18:49 +0100 Subject: [PATCH 2/2] Auto convert unit test XML data to schema v8.3 --- test/data/description.buildservice/appliance.kiwi | 4 ++-- test/data/description/config.xml | 4 ++-- test/data/example_apt_config.xml | 2 +- test/data/example_arm_disk_size_config.xml | 2 +- test/data/example_btrfs_config.xml | 2 +- test/data/example_btrfs_vol_config.xml | 2 +- test/data/example_config.xml | 4 ++-- test/data/example_config_target_dir.xml | 4 ++-- test/data/example_containers_config.xml | 2 +- test/data/example_disk_config.xml | 4 ++-- test/data/example_disk_size_config.xml | 2 +- test/data/example_disk_size_empty_vol_config.xml | 2 +- test/data/example_disk_size_oem_volume_config.xml | 2 +- test/data/example_disk_size_partition_too_small_config.xml | 2 +- test/data/example_disk_size_partitions_config.xml | 2 +- test/data/example_disk_size_vol_root_config.xml | 2 +- test/data/example_disk_size_volume_config.xml | 2 +- test/data/example_disk_size_volume_too_small_config.xml | 2 +- test/data/example_dot_profile_config.xml | 2 +- test/data/example_dot_profile_live_config.xml | 2 +- test/data/example_hkd_config.xml | 2 +- test/data/example_include_config.xml | 2 +- test/data/example_include_config_from_description_dir.xml | 2 +- test/data/example_include_config_missing_reference.xml | 2 +- test/data/example_lvm_arch_config.xml | 2 +- test/data/example_lvm_custom_rootvol_config.xml | 2 +- test/data/example_lvm_default_config.xml | 2 +- test/data/example_lvm_no_root_config.xml | 2 +- test/data/example_lvm_no_root_full_usr_config.xml | 2 +- test/data/example_lvm_preferred_config.xml | 2 +- test/data/example_multiple_users_config.xml | 2 +- test/data/example_no_default_type.xml | 2 +- test/data/example_no_image_packages_config.xml | 4 ++-- test/data/example_no_imageinclude_config.xml | 2 +- test/data/example_partitions_config.xml | 2 +- test/data/example_ppc_disk_size_config.xml | 2 +- test/data/example_pxe_config.xml | 2 +- test/data/example_runtime_checker_boot_desc_not_found.xml | 2 +- test/data/example_runtime_checker_config.xml | 2 +- test/data/example_runtime_checker_conflicting_types.xml | 2 +- .../data/example_runtime_checker_include_nested_reference.xml | 2 +- test/data/example_runtime_checker_no_boot_reference.xml | 2 +- .../example_runtime_checker_no_initrd_system_reference.xml | 2 +- test/data/example_this_path_config.xml | 2 +- test/data/image_info/config.xml | 2 +- .../isoboot/example-distribution-no-delete-section/config.xml | 2 +- test/data/isoboot/example-distribution/config.xml | 2 +- test/data/oemboot/example-distribution/config.xml | 2 +- test/data/root-dir/image/config.xml | 4 ++-- 49 files changed, 56 insertions(+), 56 deletions(-) diff --git a/test/data/description.buildservice/appliance.kiwi b/test/data/description.buildservice/appliance.kiwi index a3923214b1d..4187ceb7e8e 100644 --- a/test/data/description.buildservice/appliance.kiwi +++ b/test/data/description.buildservice/appliance.kiwi @@ -1,6 +1,6 @@ - + @@ -58,7 +58,7 @@ - + - + - + - + 1 diff --git a/test/data/example_containers_config.xml b/test/data/example_containers_config.xml index ee45873573e..14eb5f654d9 100644 --- a/test/data/example_containers_config.xml +++ b/test/data/example_containers_config.xml @@ -1,6 +1,6 @@ - + Some some@example.com diff --git a/test/data/example_disk_config.xml b/test/data/example_disk_config.xml index 474c2e0e9fb..2acbc6c18ec 100644 --- a/test/data/example_disk_config.xml +++ b/test/data/example_disk_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com @@ -18,7 +18,7 @@ false openSUSE openSUSE - + false true diff --git a/test/data/example_disk_size_config.xml b/test/data/example_disk_size_config.xml index debda2c04ad..b496f5f8aca 100644 --- a/test/data/example_disk_size_config.xml +++ b/test/data/example_disk_size_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_disk_size_empty_vol_config.xml b/test/data/example_disk_size_empty_vol_config.xml index ccfb63f5f14..44d5a0dd7b6 100644 --- a/test/data/example_disk_size_empty_vol_config.xml +++ b/test/data/example_disk_size_empty_vol_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_disk_size_oem_volume_config.xml b/test/data/example_disk_size_oem_volume_config.xml index 66d50d9b481..9e642a44099 100644 --- a/test/data/example_disk_size_oem_volume_config.xml +++ b/test/data/example_disk_size_oem_volume_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_disk_size_partition_too_small_config.xml b/test/data/example_disk_size_partition_too_small_config.xml index 186a5056fa1..a425f101da6 100644 --- a/test/data/example_disk_size_partition_too_small_config.xml +++ b/test/data/example_disk_size_partition_too_small_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_disk_size_partitions_config.xml b/test/data/example_disk_size_partitions_config.xml index 601909c65a6..2e0fef94a02 100644 --- a/test/data/example_disk_size_partitions_config.xml +++ b/test/data/example_disk_size_partitions_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_disk_size_vol_root_config.xml b/test/data/example_disk_size_vol_root_config.xml index bf663aae9ee..03cb59898e2 100644 --- a/test/data/example_disk_size_vol_root_config.xml +++ b/test/data/example_disk_size_vol_root_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_disk_size_volume_config.xml b/test/data/example_disk_size_volume_config.xml index ee94b005084..eb8785b4de0 100644 --- a/test/data/example_disk_size_volume_config.xml +++ b/test/data/example_disk_size_volume_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_disk_size_volume_too_small_config.xml b/test/data/example_disk_size_volume_too_small_config.xml index 693290b04ce..f892f6cd042 100644 --- a/test/data/example_disk_size_volume_too_small_config.xml +++ b/test/data/example_disk_size_volume_too_small_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_dot_profile_config.xml b/test/data/example_dot_profile_config.xml index 8ec726ed4d6..bbbb763609f 100644 --- a/test/data/example_dot_profile_config.xml +++ b/test/data/example_dot_profile_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_dot_profile_live_config.xml b/test/data/example_dot_profile_live_config.xml index 77301a023b0..cfcf14e86c6 100644 --- a/test/data/example_dot_profile_live_config.xml +++ b/test/data/example_dot_profile_live_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer bob@example.com diff --git a/test/data/example_hkd_config.xml b/test/data/example_hkd_config.xml index 8766c0ce396..8cfd81d70e6 100644 --- a/test/data/example_hkd_config.xml +++ b/test/data/example_hkd_config.xml @@ -1,6 +1,6 @@ - + Some some@example.com diff --git a/test/data/example_include_config.xml b/test/data/example_include_config.xml index bc8ba4c20ba..438b34a94c5 100644 --- a/test/data/example_include_config.xml +++ b/test/data/example_include_config.xml @@ -1,6 +1,6 @@ - + Marcus ms@suse.com diff --git a/test/data/example_include_config_from_description_dir.xml b/test/data/example_include_config_from_description_dir.xml index 98da6b7a404..c2ce56bbf56 100644 --- a/test/data/example_include_config_from_description_dir.xml +++ b/test/data/example_include_config_from_description_dir.xml @@ -1,6 +1,6 @@ - + Marcus ms@suse.com diff --git a/test/data/example_include_config_missing_reference.xml b/test/data/example_include_config_missing_reference.xml index f878f7cd135..ff07ba09346 100644 --- a/test/data/example_include_config_missing_reference.xml +++ b/test/data/example_include_config_missing_reference.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_lvm_arch_config.xml b/test/data/example_lvm_arch_config.xml index b73ba357b31..4278cf55b0b 100644 --- a/test/data/example_lvm_arch_config.xml +++ b/test/data/example_lvm_arch_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer some@some.com diff --git a/test/data/example_lvm_custom_rootvol_config.xml b/test/data/example_lvm_custom_rootvol_config.xml index aaf072ab3ba..2c2a8e7966a 100644 --- a/test/data/example_lvm_custom_rootvol_config.xml +++ b/test/data/example_lvm_custom_rootvol_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_lvm_default_config.xml b/test/data/example_lvm_default_config.xml index ec016d67f13..faca3ed2711 100644 --- a/test/data/example_lvm_default_config.xml +++ b/test/data/example_lvm_default_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_lvm_no_root_config.xml b/test/data/example_lvm_no_root_config.xml index f72ff71ec1b..68c60562792 100644 --- a/test/data/example_lvm_no_root_config.xml +++ b/test/data/example_lvm_no_root_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_lvm_no_root_full_usr_config.xml b/test/data/example_lvm_no_root_full_usr_config.xml index 9e932325a75..6570b8a702f 100644 --- a/test/data/example_lvm_no_root_full_usr_config.xml +++ b/test/data/example_lvm_no_root_full_usr_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_lvm_preferred_config.xml b/test/data/example_lvm_preferred_config.xml index 7f81a6102d4..b554d350dad 100644 --- a/test/data/example_lvm_preferred_config.xml +++ b/test/data/example_lvm_preferred_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_multiple_users_config.xml b/test/data/example_multiple_users_config.xml index 5a622a1d9a7..9bb70f5d1f4 100644 --- a/test/data/example_multiple_users_config.xml +++ b/test/data/example_multiple_users_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_no_default_type.xml b/test/data/example_no_default_type.xml index e226ab24cea..8a1dfa4d520 100644 --- a/test/data/example_no_default_type.xml +++ b/test/data/example_no_default_type.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_no_image_packages_config.xml b/test/data/example_no_image_packages_config.xml index b57aeeabb50..7429c54b2aa 100644 --- a/test/data/example_no_image_packages_config.xml +++ b/test/data/example_no_image_packages_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com @@ -18,7 +18,7 @@ false openSUSE openSUSE - + diff --git a/test/data/example_no_imageinclude_config.xml b/test/data/example_no_imageinclude_config.xml index b7148b52d11..4a3dea76c50 100644 --- a/test/data/example_no_imageinclude_config.xml +++ b/test/data/example_no_imageinclude_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_partitions_config.xml b/test/data/example_partitions_config.xml index 7595248094a..c021ff72377 100644 --- a/test/data/example_partitions_config.xml +++ b/test/data/example_partitions_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_ppc_disk_size_config.xml b/test/data/example_ppc_disk_size_config.xml index 01badb05e07..c691ee020c7 100644 --- a/test/data/example_ppc_disk_size_config.xml +++ b/test/data/example_ppc_disk_size_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_pxe_config.xml b/test/data/example_pxe_config.xml index bb281221f3c..bafd1aef1f2 100644 --- a/test/data/example_pxe_config.xml +++ b/test/data/example_pxe_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_runtime_checker_boot_desc_not_found.xml b/test/data/example_runtime_checker_boot_desc_not_found.xml index 7b637d91a5c..3e44838bf7a 100644 --- a/test/data/example_runtime_checker_boot_desc_not_found.xml +++ b/test/data/example_runtime_checker_boot_desc_not_found.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_runtime_checker_config.xml b/test/data/example_runtime_checker_config.xml index fd292c97fca..d3204a03c8c 100644 --- a/test/data/example_runtime_checker_config.xml +++ b/test/data/example_runtime_checker_config.xml @@ -1,6 +1,6 @@ - + diff --git a/test/data/example_runtime_checker_conflicting_types.xml b/test/data/example_runtime_checker_conflicting_types.xml index 3de1aae13f8..77b92d7e657 100644 --- a/test/data/example_runtime_checker_conflicting_types.xml +++ b/test/data/example_runtime_checker_conflicting_types.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.de diff --git a/test/data/example_runtime_checker_include_nested_reference.xml b/test/data/example_runtime_checker_include_nested_reference.xml index db52f38e70e..7415537387c 100644 --- a/test/data/example_runtime_checker_include_nested_reference.xml +++ b/test/data/example_runtime_checker_include_nested_reference.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_runtime_checker_no_boot_reference.xml b/test/data/example_runtime_checker_no_boot_reference.xml index 27c5bb613e5..f28c1356139 100644 --- a/test/data/example_runtime_checker_no_boot_reference.xml +++ b/test/data/example_runtime_checker_no_boot_reference.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_runtime_checker_no_initrd_system_reference.xml b/test/data/example_runtime_checker_no_initrd_system_reference.xml index 9d87e3e282d..da144b5237b 100644 --- a/test/data/example_runtime_checker_no_initrd_system_reference.xml +++ b/test/data/example_runtime_checker_no_initrd_system_reference.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/example_this_path_config.xml b/test/data/example_this_path_config.xml index 004fb739042..8a8fbb1510e 100644 --- a/test/data/example_this_path_config.xml +++ b/test/data/example_this_path_config.xml @@ -1,6 +1,6 @@ - + Marcus Schäfer ms@suse.com diff --git a/test/data/image_info/config.xml b/test/data/image_info/config.xml index 356cf474974..55dced69943 100644 --- a/test/data/image_info/config.xml +++ b/test/data/image_info/config.xml @@ -1,6 +1,6 @@ - + Marcus ms@suse.com diff --git a/test/data/isoboot/example-distribution-no-delete-section/config.xml b/test/data/isoboot/example-distribution-no-delete-section/config.xml index 17ac605c830..ecc51e9db7e 100644 --- a/test/data/isoboot/example-distribution-no-delete-section/config.xml +++ b/test/data/isoboot/example-distribution-no-delete-section/config.xml @@ -1,6 +1,6 @@ - + Marcus Schaefer ms@novell.com diff --git a/test/data/isoboot/example-distribution/config.xml b/test/data/isoboot/example-distribution/config.xml index b4cce21d3a1..01547d07c5d 100644 --- a/test/data/isoboot/example-distribution/config.xml +++ b/test/data/isoboot/example-distribution/config.xml @@ -1,6 +1,6 @@ - + Marcus Schaefer ms@novell.com diff --git a/test/data/oemboot/example-distribution/config.xml b/test/data/oemboot/example-distribution/config.xml index 1f293564893..3cbf9ea918f 100644 --- a/test/data/oemboot/example-distribution/config.xml +++ b/test/data/oemboot/example-distribution/config.xml @@ -1,6 +1,6 @@ - + Marcus Schaefer ms@novell.com diff --git a/test/data/root-dir/image/config.xml b/test/data/root-dir/image/config.xml index a3923214b1d..4187ceb7e8e 100644 --- a/test/data/root-dir/image/config.xml +++ b/test/data/root-dir/image/config.xml @@ -1,6 +1,6 @@ - + @@ -58,7 +58,7 @@ - +