From 7627f2c677052dfe7ab00b3a213dc99c125a120b Mon Sep 17 00:00:00 2001
From: Leif Liddy <leif.liddy@gmail.com>
Date: Tue, 1 Aug 2023 04:30:23 +0200
Subject: [PATCH 1/2] add GRUB_TIMEOUT_STYLE menu option

revert trailing space removal
---
 kiwi/schema/kiwi.rnc | 2 +-
 kiwi/schema/kiwi.rng | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc
index a8fc8b7b673..fbf7c69ba55 100644
--- a/kiwi/schema/kiwi.rnc
+++ b/kiwi/schema/kiwi.rnc
@@ -2794,7 +2794,7 @@ div {
         ## expired. In countdown mode an indication of the remaining time
         ## is displayed. The attribute is available for the grub loader.
         attribute timeout_style {
-            "countdown" | "hidden"
+            "countdown" | "hidden" | "menu"
         }
         >> sch:pattern [ id = "timeout_style" is-a = "bootloader_name_type"
             sch:param [ name = "attr" value = "timeout_style" ]
diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng
index 2b32feaf77c..70b2d5eaa33 100644
--- a/kiwi/schema/kiwi.rng
+++ b/kiwi/schema/kiwi.rng
@@ -4178,6 +4178,7 @@ is displayed. The attribute is available for the grub loader.</a:documentation>
         <choice>
           <value>countdown</value>
           <value>hidden</value>
+          <value>menu</value>
         </choice>
       </attribute>
       <sch:pattern id="timeout_style" is-a="bootloader_name_type">

From e50fbe851fdcdfc1ac1d912cc097ed209ef26fdf Mon Sep 17 00:00:00 2001
From: Leif Liddy <leif.liddy@gmail.com>
Date: Tue, 1 Aug 2023 13:53:01 +0200
Subject: [PATCH 2/2] remove trailing whitespace

---
 kiwi/schema/kiwi.rnc |  62 ++++++------
 kiwi/schema/kiwi.rng | 218 +++++++++++++++++++++----------------------
 2 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc
index fbf7c69ba55..1a0d553cd16 100644
--- a/kiwi/schema/kiwi.rnc
+++ b/kiwi/schema/kiwi.rnc
@@ -13,7 +13,7 @@
 #               : configuration files. The schema is maintained
 #               : in the relax compact syntax. Any changes should
 #               : made in !! *** kiwi.rnc *** !!
-#               : 
+#               :
 #               :
 # STATUS        : Development
 #****************
@@ -53,7 +53,7 @@ start =
 # main block: <image>
 #
 div {
-    k.image.name.attribute = k.imagename.attribute 
+    k.image.name.attribute = k.imagename.attribute
     k.image.displayname.attribute = k.displayname.attribute
     k.image.noNamespaceSchemaLocation.attribute =
         ## The location of the XSD Schema (not relevant for RELAX NG or DTD)
@@ -70,7 +70,7 @@ div {
         ## An identification number which is represented in a file
         ## named /etc/ImageID
         attribute id { text }
-    k.image.attlist = k.image.name.attribute 
+    k.image.attlist = k.image.name.attribute
         & k.image.displayname.attribute?
         & k.image.id?
         & k.image.schemaversion.attribute
@@ -78,7 +78,7 @@ div {
             | k.image.schemaLocation.attribute? )?
 
     k.image =
-        ## The root element of the configuration file   
+        ## The root element of the configuration file
         element image {
             k.image.attlist &
             k.include* &
@@ -259,7 +259,7 @@ div {
 #
 div {
     k.contact.attlist = empty
-    k.contact = 
+    k.contact =
         ## Contact Information from the Author, like Email etc.
         element contact {
             k.contact.attlist,
@@ -293,7 +293,7 @@ div {
     k.ignore.attlist =
         k.ignore.name.attribute &
         k.ignore.arch.attribute?
-    k.ignore = 
+    k.ignore =
         ## Ignores a Package
         element ignore {
             k.ignore.attlist,
@@ -640,7 +640,7 @@ div {
     k.oem-shutdown.content = xsd:boolean
     k.oem-shutdown.attlist = empty
     k.oem-shutdown =
-        ## For oemboot driven images: shutdown after first deployment 
+        ## For oemboot driven images: shutdown after first deployment
         ## true/false
         element oem-shutdown {
             k.oem-shutdown.attlist,
@@ -655,7 +655,7 @@ div {
     k.oem-shutdown-interactive.content = xsd:boolean
     k.oem-shutdown-interactive.attlist = empty
     k.oem-shutdown-interactive =
-        ## For oemboot driven images: shutdown after first deployment 
+        ## For oemboot driven images: shutdown after first deployment
         ## true/false
         element oem-shutdown-interactive {
             k.oem-shutdown-interactive.attlist,
@@ -962,7 +962,7 @@ div {
 # common element <packagemanager>
 #
 div {
-    k.packagemanager.content = 
+    k.packagemanager.content =
         "apt" | "zypper" | "dnf4" | "dnf5" | "microdnf" | "pacman"
     k.packagemanager.attlist = empty
     k.packagemanager =
@@ -1020,7 +1020,7 @@ div {
 # common element <requires>
 #
 div {
-    k.requires.profile.attribute = 
+    k.requires.profile.attribute =
         ## The profile name required as part of the current profile
         ## definition.
         attribute profile {text}
@@ -1134,11 +1134,11 @@ div {
         ]
         >> sch:pattern [ id = "single_deboostrap_repo"
             sch:rule [ context = "image"
-                sch:assert [ 
+                sch:assert [
                     test = "count(repository[@use_for_bootstrap='true'])<=1"
                     "There can only be a single repository set for "
                     "bootstrap ('use_for_bootstrap' attribute)"
-                ] 
+                ]
             ]
         ]
     k.repository.attlist =
@@ -1207,7 +1207,7 @@ div {
     k.rpm-check-signatures.content = xsd:boolean
     k.rpm-check-signatures.attlist = empty
     k.rpm-check-signatures =
-        ## Sets the used package manager to validate, or not, the 
+        ## Sets the used package manager to validate, or not, the
         ## repository and/or package signatures. The behavior can be
         ## slightly different depending on the used package manager.
         ## This is a system wide package manager option, so that, this
@@ -1331,7 +1331,7 @@ div {
 #
 div {
     k.timezone.attlist = empty
-    k.timezone =  
+    k.timezone =
         ## Setup Image Timezone setup
         element timezone {
             k.timezone.attlist,
@@ -1606,7 +1606,7 @@ div {
         ]
     k.type.efiparttable.attribute =
         ## For images with an EFI firmware specifies the partition
-        ## table type to use. If not set defaults to gpt partition 
+        ## table type to use. If not set defaults to gpt partition
         ## table type.
         attribute efiparttable { "msdos" | "gpt" }
         >> sch:pattern [ id = "efiparttable" is-a = "image_type"
@@ -1655,7 +1655,7 @@ div {
             sch:param [ name = "attr" value = "editbootinstall" ]
             sch:param [ name = "types" value = "oem" ]
         ]
-    k.type.filesystem.attribute = 
+    k.type.filesystem.attribute =
         ## Specifies the root filesystem type
         attribute filesystem {
             "btrfs" | "ext2" | "ext3" | "ext4" | "squashfs" | "xfs"
@@ -1669,7 +1669,7 @@ div {
             sch:param [ name = "attr" value = "filesystem" ]
             sch:param [ name = "types" value = "oem" ]
         ]
-	k.type.squashfscompression.attribute = 
+	k.type.squashfscompression.attribute =
         ## Specifies the compression type for mksquashfs
         attribute squashfscompression {
             "uncompressed" | "gzip" | "lzo" | "lz4" | "xz" | "zstd"
@@ -2107,7 +2107,7 @@ div {
         >> sch:pattern [ id = "rootfs_label" is-a = "image_type"
             sch:param [ name = "attr" value = "rootfs_label" ]
             sch:param [ name = "types" value = "oem pxe kis docker" ]
-        ] 
+        ]
     k.type.vga.attribute =
         ## Specifies the kernel framebuffer mode. More information
         ## about the possible values can be found by calling
@@ -2313,7 +2313,7 @@ div {
         k.type.bundle_format.attribute?
     k.type =
         ## The Image Type of the Logical Extend
-        element type { 
+        element type {
             k.type.attlist &
             k.bootloader? &
             k.containerconfig? &
@@ -2333,7 +2333,7 @@ div {
 #
 div {
     k.user.name.attribute = k.name.attribute
-    k.user.id.attribute = 
+    k.user.id.attribute =
         ## The user ID for this user
         attribute id { xsd:nonNegativeInteger }
     k.user.groups.attribute =
@@ -2378,7 +2378,7 @@ div {
 div {
     k.version.attlist = empty
     k.version =
-        ## A Version Number for the Image, Consists of Major.Minor.Release 
+        ## A Version Number for the Image, Consists of Major.Minor.Release
         element version {
             k.version.attlist &
             text
@@ -2422,7 +2422,7 @@ div {
     k.vmdisk.device.attribute =
         ## The disk device to appear in the guest (xen only)
         attribute device { text }
-    k.vmdisk.diskmode.attribute = 
+    k.vmdisk.diskmode.attribute =
         ## The disk mode (vmdk only)
         attribute diskmode {
             "monolithicSparse"     |
@@ -2646,7 +2646,7 @@ div {
 # main block: <description>
 #
 div {
-    k.description.type.attribute = 
+    k.description.type.attribute =
         ## Kiwi distinguishes between two basic image description types
         ## which uses the same format but one is created and provided by
         ## the kiwi developers and the other is created by the users of
@@ -2655,7 +2655,7 @@ div {
         ## a standard image description created by a kiwi user.
         attribute type { "boot" | "system" }
     k.description.attlist = k.description.type.attribute
-    k.description =  
+    k.description =
         ## A Short Description
         element description {
             k.description.attlist &
@@ -2671,11 +2671,11 @@ div {
 #
 div {
     k.drivers.profiles.attribute = k.profiles.attribute
-    k.drivers.attlist = 
+    k.drivers.attlist =
         k.drivers.profiles.attribute?
-        
+
     k.drivers =
-        ## A Collection of Driver Files 
+        ## A Collection of Driver Files
         element drivers {
             k.drivers.attlist &
             k.file+
@@ -3360,7 +3360,7 @@ div {
 # main block: <dracut>
 #
 div {
-    k.dracut.module.attribute = 
+    k.dracut.module.attribute =
         ## A module name
         attribute module { text }
     k.dracut.attlist =
@@ -3529,7 +3529,7 @@ div {
     k.preferences.attlist =
         k.preferences.profiles.attribute? &
         k.preferences.arch.attribute?
-    k.preferences =  
+    k.preferences =
         ## Configuration Information Needed for Logical Extend
         ## All elements are optional since the combination of appropriate
         ## preference sections based on profiles combine to create on vaild
@@ -3557,7 +3557,7 @@ div {
 #
 div {
     k.profiles.attlist = empty
-    k.profiles =  
+    k.profiles =
         ## Namespace section which creates a namespace and the
         ## drivers can bind itself to one of the listed namespaces.
         element profiles {
@@ -3573,7 +3573,7 @@ div {
     k.users.profiles.attribute = k.profiles.attribute
     k.users.attlist =
         k.users.profiles.attribute?
-    k.users = 
+    k.users =
         ## A List of Users
         element users {
             k.users.attlist &
diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng
index 70b2d5eaa33..c2f89396ef7 100644
--- a/kiwi/schema/kiwi.rng
+++ b/kiwi/schema/kiwi.rng
@@ -15,7 +15,7 @@
                 : configuration files. The schema is maintained
                 : in the relax compact syntax. Any changes should
                 : made in !! *** kiwi.rnc *** !!
-                : 
+                :
                 :
   STATUS        : Development
   ****************
@@ -109,7 +109,7 @@
   <!--
     ==========================================
     start with image description
-    
+
   -->
   <start>
     <ref name="k.image">
@@ -119,7 +119,7 @@
   <!--
     ==========================================
     main block: <image>
-    
+
   -->
   <div>
     <define name="k.image.name.attribute">
@@ -216,7 +216,7 @@ named /etc/ImageID</a:documentation>
   <!--
     ==========================================
     common attributes
-    
+
   -->
   <define name="k.id.attribute">
     <attribute name="id">
@@ -349,7 +349,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <extension>
-    
+
   -->
   <div>
     <define name="k.extension.attlist">
@@ -368,7 +368,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <archive>
-    
+
   -->
   <div>
     <define name="k.archive.name.attribute">
@@ -407,7 +407,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <author>
-    
+
   -->
   <div>
     <define name="k.author.attlist">
@@ -424,7 +424,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <license>
-    
+
   -->
   <div>
     <define name="k.license.attlist">
@@ -441,7 +441,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <bootloader-theme>
-    
+
   -->
   <div>
     <define name="k.bootloader-theme.attlist">
@@ -458,7 +458,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <bootsplash-theme>
-    
+
   -->
   <div>
     <define name="k.bootsplash-theme.attlist">
@@ -475,7 +475,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <contact>
-    
+
   -->
   <div>
     <define name="k.contact.attlist">
@@ -492,7 +492,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <file>
-    
+
   -->
   <div>
     <define name="k.file.name.attribute">
@@ -520,7 +520,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <ignore>
-    
+
   -->
   <div>
     <define name="k.ignore.name.attribute">
@@ -548,7 +548,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <keytable>
-    
+
   -->
   <div>
     <define name="k.keytable.attlist">
@@ -565,7 +565,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <locale>
-    
+
   -->
   <div>
     <!-- locale -->
@@ -583,7 +583,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <rpm-locale-filtering>
-    
+
   -->
   <div>
     <define name="k.rpm-locale-filtering.content">
@@ -610,7 +610,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <namedCollection>
-    
+
   -->
   <div>
     <define name="k.namedCollection.name.attribute">
@@ -638,7 +638,7 @@ file was fetched</a:documentation>
   <!--
     ==========================================
     common element <collectionModule>
-    
+
   -->
   <div>
     <sch:pattern id="collection_module_scope">
@@ -693,7 +693,7 @@ given stream) or disabled.</a:documentation>
   <!--
     ==========================================
     common element <oem-boot-title>
-    
+
   -->
   <div>
     <define name="k.oem-boot-title.attlist">
@@ -712,7 +712,7 @@ of the OEM image</a:documentation>
   <!--
     ==========================================
     common element <oem-bootwait>
-    
+
   -->
   <div>
     <define name="k.oem-bootwait.content">
@@ -732,7 +732,7 @@ of the OEM image</a:documentation>
   <!--
     ==========================================
     common element <oem-resize>
-    
+
   -->
   <div>
     <define name="k.oem-resize.content">
@@ -757,7 +757,7 @@ of the kiwi oem dracut module that implements the resize</a:documentation>
   <!--
     ==========================================
     common element <oem-resize-once>
-    
+
   -->
   <div>
     <define name="k.oem-resize-once.content">
@@ -781,7 +781,7 @@ operation happens only once and then never again</a:documentation>
   <!--
     ==========================================
     common element <oem-device-filter>
-    
+
   -->
   <div>
     <define name="k.oem-device-filter.content">
@@ -803,7 +803,7 @@ operator</a:documentation>
   <!--
     ==========================================
     common element <oem-nic-filter>
-    
+
   -->
   <div>
     <define name="k.oem-nic-filter.content">
@@ -828,7 +828,7 @@ line in a netboot deployment</a:documentation>
   <!--
     ==========================================
     common element <oem-inplace-recovery>
-    
+
   -->
   <div>
     <define name="k.oem-inplace-recovery.content">
@@ -851,7 +851,7 @@ of the oem image</a:documentation>
   <!--
     ==========================================
     common element <oem-kiwi-initrd>
-    
+
   -->
   <div>
     <define name="k.oem-kiwi-initrd.content">
@@ -872,7 +872,7 @@ and don't replace it with mkinitrd created initrd</a:documentation>
   <!--
     ==========================================
     common element <oem-partition-install>
-    
+
   -->
   <div>
     <define name="k.oem-partition-install.content">
@@ -895,7 +895,7 @@ will not have any effect</a:documentation>
   <!--
     ==========================================
     common element <oem-reboot>
-    
+
   -->
   <div>
     <define name="k.oem-reboot.content">
@@ -915,7 +915,7 @@ will not have any effect</a:documentation>
   <!--
     ==========================================
     common element <oem-reboot-interactive>
-    
+
   -->
   <div>
     <define name="k.oem-reboot-interactive.content">
@@ -936,7 +936,7 @@ with an interactive dialog true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-recovery>
-    
+
   -->
   <div>
     <define name="k.oem-recovery.content">
@@ -956,7 +956,7 @@ with an interactive dialog true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-recoveryID>
-    
+
   -->
   <div>
     <define name="k.oem-recoveryID.attlist">
@@ -974,7 +974,7 @@ recovery partition. Default value is 83 (Linux)</a:documentation>
   <!--
     ==========================================
     common element <oem-recovery-part-size>
-    
+
   -->
   <div>
     <define name="k.oem-recovery-part-size.attlist">
@@ -992,7 +992,7 @@ recovery partition. Value is interpreted as MB</a:documentation>
   <!--
     ==========================================
     common element <oem-shutdown>
-    
+
   -->
   <div>
     <define name="k.oem-shutdown.content">
@@ -1003,7 +1003,7 @@ recovery partition. Value is interpreted as MB</a:documentation>
     </define>
     <define name="k.oem-shutdown">
       <element name="oem-shutdown">
-        <a:documentation>For oemboot driven images: shutdown after first deployment 
+        <a:documentation>For oemboot driven images: shutdown after first deployment
 true/false</a:documentation>
         <ref name="k.oem-shutdown.attlist"/>
         <ref name="k.oem-shutdown.content"/>
@@ -1013,7 +1013,7 @@ true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-shutdown-interactive>
-    
+
   -->
   <div>
     <define name="k.oem-shutdown-interactive.content">
@@ -1024,7 +1024,7 @@ true/false</a:documentation>
     </define>
     <define name="k.oem-shutdown-interactive">
       <element name="oem-shutdown-interactive">
-        <a:documentation>For oemboot driven images: shutdown after first deployment 
+        <a:documentation>For oemboot driven images: shutdown after first deployment
 true/false</a:documentation>
         <ref name="k.oem-shutdown-interactive.attlist"/>
         <ref name="k.oem-shutdown-interactive.content"/>
@@ -1034,7 +1034,7 @@ true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-silent-boot>
-    
+
   -->
   <div>
     <define name="k.oem-silent-boot.content">
@@ -1055,7 +1055,7 @@ true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-silent-install>
-    
+
   -->
   <div>
     <define name="k.oem-silent-install.content">
@@ -1076,7 +1076,7 @@ dump process, true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-skip-verify>
-    
+
   -->
   <div>
     <define name="k.oem-skip-verify.content">
@@ -1097,7 +1097,7 @@ verification process, true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-vmcp-parmfile>
-    
+
   -->
   <div>
     <define name="k.oem-vmcp-parmfile.content">
@@ -1119,7 +1119,7 @@ is set to: PARM-S11</a:documentation>
   <!--
     ==========================================
     common element <oem-multipath-scan>
-    
+
   -->
   <div>
     <define name="k.oem-multipath-scan.content">
@@ -1140,7 +1140,7 @@ for multipath devices: true/false (default is true)</a:documentation>
   <!--
     ==========================================
     common element <oem-silent-verify>
-    
+
   -->
   <div>
     <define name="k.oem-silent-verify.content">
@@ -1161,7 +1161,7 @@ verification process, true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-swap>
-    
+
   -->
   <div>
     <define name="k.oem-swap.content">
@@ -1181,7 +1181,7 @@ verification process, true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-swapsize>
-    
+
   -->
   <div>
     <define name="k.oem-swapsize.attlist">
@@ -1199,7 +1199,7 @@ partition in MB</a:documentation>
   <!--
     ==========================================
     common element <oem-swapname>
-    
+
   -->
   <div>
     <define name="k.oem-swapname.attlist">
@@ -1221,7 +1221,7 @@ no effect.</a:documentation>
   <!--
     ==========================================
     common element <oem-systemsize>
-    
+
   -->
   <div>
     <define name="k.oem-systemsize.attlist">
@@ -1240,7 +1240,7 @@ will grow to the maximum available free space on the disk</a:documentation>
   <!--
     ==========================================
     common element <oem-unattended>
-    
+
   -->
   <div>
     <define name="k.oem-unattended.content">
@@ -1261,7 +1261,7 @@ true/false</a:documentation>
   <!--
     ==========================================
     common element <oem-unattended-id>
-    
+
   -->
   <div>
     <define name="k.oem-unattended-id.attlist">
@@ -1279,7 +1279,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <product>
-    
+
   -->
   <div>
     <define name="k.product.name.attribute">
@@ -1307,7 +1307,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <option>
-    
+
   -->
   <div>
     <define name="k.option.name.attribute">
@@ -1335,7 +1335,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <shimoption>
-    
+
   -->
   <div>
     <define name="k.shimoption.name.attribute">
@@ -1363,7 +1363,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <installoption>
-    
+
   -->
   <div>
     <define name="k.installoption.name.attribute">
@@ -1391,7 +1391,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <configoption>
-    
+
   -->
   <div>
     <define name="k.configoption.name.attribute">
@@ -1419,7 +1419,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <package>
-    
+
   -->
   <div>
     <define name="k.package.name.attribute">
@@ -1459,7 +1459,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <packagemanager>
-    
+
   -->
   <div>
     <define name="k.packagemanager.content">
@@ -1486,7 +1486,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <release-version>
-    
+
   -->
   <div>
     <define name="k.release-version.content">
@@ -1506,7 +1506,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
   <!--
     ==========================================
     common element <profile>
-    
+
   -->
   <div>
     <define name="k.profile.name.attribute">
@@ -1555,7 +1555,7 @@ packages.</a:documentation>
   <!--
     ==========================================
     common element <requires>
-    
+
   -->
   <div>
     <define name="k.requires.profile.attribute">
@@ -1579,7 +1579,7 @@ definition can be composed by other existing profiles.</a:documentation>
   <!--
     ==========================================
     common element <repository>
-    
+
   -->
   <div>
     <sch:pattern abstract="true" id="repo_type">
@@ -1779,7 +1779,7 @@ last one is picked.</a:documentation>
   <!--
     ==========================================
     common element <signing>
-    
+
   -->
   <div>
     <define name="k.signing.key.attribute">
@@ -1803,7 +1803,7 @@ repo/package signing keys</a:documentation>
   <!--
     ==========================================
     common element <source>
-    
+
   -->
   <div>
     <define name="k.source.path.attribute">
@@ -1826,7 +1826,7 @@ as well as a path specification</a:documentation>
   <!--
     ==========================================
     common element <rpm-check-signatures>
-    
+
   -->
   <div>
     <define name="k.rpm-check-signatures.content">
@@ -1837,7 +1837,7 @@ as well as a path specification</a:documentation>
     </define>
     <define name="k.rpm-check-signatures">
       <element name="rpm-check-signatures">
-        <a:documentation>Sets the used package manager to validate, or not, the 
+        <a:documentation>Sets the used package manager to validate, or not, the
 repository and/or package signatures. The behavior can be
 slightly different depending on the used package manager.
 This is a system wide package manager option, so that, this
@@ -1851,7 +1851,7 @@ The default value is false.</a:documentation>
   <!--
     ==========================================
     common element <rpm-excludedocs>
-    
+
   -->
   <div>
     <define name="k.rpm-excludedocs.content">
@@ -1873,7 +1873,7 @@ according to the used package manager.</a:documentation>
   <!--
     ==========================================
     common element <showlicense>
-    
+
   -->
   <div>
     <define name="k.showlicense.attlist">
@@ -1891,7 +1891,7 @@ will be displayed in a dialog window on boot.</a:documentation>
   <!--
     ==========================================
     common element <size>
-    
+
   -->
   <div>
     <define name="k.size.unit.attribute">
@@ -1947,7 +1947,7 @@ to the required size of the image</a:documentation>
   <!--
     ==========================================
     common element <specification>
-    
+
   -->
   <div>
     <define name="k.specification.attlist">
@@ -1965,7 +1965,7 @@ can be used for.</a:documentation>
   <!--
     ==========================================
     common element <systemdisk>
-    
+
   -->
   <div>
     <define name="k.systemdisk.name.attribute">
@@ -2007,7 +2007,7 @@ volume management system</a:documentation>
   <!--
     ==========================================
     common element <timezone>
-    
+
   -->
   <div>
     <define name="k.timezone.attlist">
@@ -2024,7 +2024,7 @@ volume management system</a:documentation>
   <!--
     ==========================================
     common element <type>
-    
+
   -->
   <div>
     <sch:pattern abstract="true" id="image_type">
@@ -2320,7 +2320,7 @@ partitions needs to be created in an msdos table</a:documentation>
     <define name="k.type.efiparttable.attribute">
       <attribute name="efiparttable">
         <a:documentation>For images with an EFI firmware specifies the partition
-table type to use. If not set defaults to gpt partition 
+table type to use. If not set defaults to gpt partition
 table type.</a:documentation>
         <choice>
           <value>msdos</value>
@@ -3458,7 +3458,7 @@ kiwi-ng result bundle ...</a:documentation>
   <!--
     ==========================================
     common element <user>
-    
+
   -->
   <div>
     <define name="k.user.name.attribute">
@@ -3543,7 +3543,7 @@ to the user according to he specifing toolchain behaviour.</a:documentation>
   <!--
     ==========================================
     common element <version>
-    
+
   -->
   <div>
     <define name="k.version.attlist">
@@ -3562,7 +3562,7 @@ to the user according to he specifing toolchain behaviour.</a:documentation>
   <!--
     ==========================================
     common element <vmconfig-entry>
-    
+
   -->
   <div>
     <define name="k.vmconfig-entry.attlist">
@@ -3581,7 +3581,7 @@ to the user according to he specifing toolchain behaviour.</a:documentation>
   <!--
     ==========================================
     common element <vmdisk>
-    
+
   -->
   <div>
     <define name="k.vmdisk.disktype.attribute">
@@ -3658,7 +3658,7 @@ by the VM (ova only)</a:documentation>
   <!--
     ==========================================
     common element <vmdvd>
-    
+
   -->
   <div>
     <define name="k.vmdvd.controller.attribute">
@@ -3696,7 +3696,7 @@ scsi CD or an ide CD drive</a:documentation>
   <!--
     ==========================================
     common element <vmnic>
-    
+
   -->
   <div>
     <define name="k.vmnic.driver.attribute">
@@ -3747,7 +3747,7 @@ scsi CD or an ide CD drive</a:documentation>
   <!--
     ==========================================
     common element <partition>
-    
+
   -->
   <div>
     <sch:pattern abstract="true" id="partition_name_type">
@@ -3851,7 +3851,7 @@ Allowed values are: t.linux</a:documentation>
   <!--
     ==========================================
     common element <volume>
-    
+
   -->
   <div>
     <define name="k.volume.freespace.attribute">
@@ -3954,7 +3954,7 @@ on an extra volume.</a:documentation>
   <!--
     ==========================================
     main block: <include>
-    
+
   -->
   <div>
     <define name="k.include.from.attribute">
@@ -3975,7 +3975,7 @@ statement with its contents</a:documentation>
   <!--
     ==========================================
     main block: <description>
-    
+
   -->
   <div>
     <define name="k.description.type.attribute">
@@ -4015,7 +4015,7 @@ a standard image description created by a kiwi user.</a:documentation>
   <!--
     ==========================================
     main block: <drivers>
-    
+
   -->
   <div>
     <define name="k.drivers.profiles.attribute">
@@ -4041,7 +4041,7 @@ a standard image description created by a kiwi user.</a:documentation>
   <!--
     ==========================================
     main block: <strip>
-    
+
   -->
   <div>
     <define name="k.strip.type.attribute">
@@ -4083,7 +4083,7 @@ references file names in linux lib directories to keep.</a:documentation>
   <!--
     ==========================================
     main block: <bootloader>
-    
+
   -->
   <div>
     <sch:pattern abstract="true" id="bootloader_image_type">
@@ -4252,7 +4252,7 @@ and to provide configuration parameters for it</a:documentation>
   <!--
     ==========================================
     main block: <containerconfig>
-    
+
   -->
   <div>
     <sch:pattern abstract="true" id="container_type">
@@ -4379,7 +4379,7 @@ section provides globally useful container information.</a:documentation>
   <!--
     ==========================================
     main block: <entrypoint>
-    
+
   -->
   <div>
     <define name="k.entrypoint.execute.attribute">
@@ -4410,7 +4410,7 @@ can be optionally specified</a:documentation>
   <!--
     ==========================================
     main block: <subcommand>
-    
+
   -->
   <div>
     <define name="k.subcommand.execute.attribute">
@@ -4445,7 +4445,7 @@ execution command</a:documentation>
   <!--
     ==========================================
     main block: <argument>
-    
+
   -->
   <div>
     <define name="k.argument.name.attribute">
@@ -4469,7 +4469,7 @@ execution command</a:documentation>
   <!--
     ==========================================
     main block: <expose>
-    
+
   -->
   <div>
     <define name="k.expose.attlist">
@@ -4492,7 +4492,7 @@ be configured</a:documentation>
   <!--
     ==========================================
     main block: <port>
-    
+
   -->
   <div>
     <define name="k.port.number.attribute">
@@ -4518,7 +4518,7 @@ If no protocol is defined OCI defaults are applied.</a:documentation>
   <!--
     ==========================================
     main block: <volumes>
-    
+
   -->
   <div>
     <define name="k.volumes.attlist">
@@ -4540,7 +4540,7 @@ At least one volume must be configured</a:documentation>
   <!--
     ==========================================
     main block: <partitions>
-    
+
   -->
   <div>
     <define name="k.partitions.attlist">
@@ -4562,7 +4562,7 @@ of the storage device</a:documentation>
   <!--
     ==========================================
     main block: <luksformat>
-    
+
   -->
   <div>
     <sch:pattern id="luks_requirement">
@@ -4588,7 +4588,7 @@ of the storage device</a:documentation>
   <!--
     ==========================================
     main block: <bootloadersettings>
-    
+
   -->
   <div>
     <define name="k.bootloadersettings.attlist">
@@ -4615,7 +4615,7 @@ of the storage device</a:documentation>
   <!--
     ==========================================
     main block: <environment>
-    
+
   -->
   <div>
     <define name="k.environment.attlist">
@@ -4637,7 +4637,7 @@ At least one environment variable must be configured</a:documentation>
   <!--
     ==========================================
     main block: <env>
-    
+
   -->
   <div>
     <define name="k.env.name.attribute">
@@ -4669,7 +4669,7 @@ At least one environment variable must be configured</a:documentation>
   <!--
     ==========================================
     main block: <labels>
-    
+
   -->
   <div>
     <define name="k.labels.attlist">
@@ -4691,7 +4691,7 @@ At least one label must be configured</a:documentation>
   <!--
     ==========================================
     main block: <label>
-    
+
   -->
   <div>
     <define name="k.label.name.attribute">
@@ -4723,7 +4723,7 @@ At least one label must be configured</a:documentation>
   <!--
     ==========================================
     main block: <history>
-    
+
   -->
   <div>
     <define name="k.history.created_by.attribute">
@@ -4787,7 +4787,7 @@ the 'comment' entry.</a:documentation>
   <!--
     ==========================================
     main block: <oemconfig>
-    
+
   -->
   <div>
     <define name="k.oemconfig.attlist">
@@ -4891,7 +4891,7 @@ and setup the system disk.</a:documentation>
   <!--
     ==========================================
     main block: <vagrantconfig>
-    
+
   -->
   <div>
     <sch:pattern abstract="true" id="vagrant_provider">
@@ -4967,7 +4967,7 @@ configuration options which are used inside a vagrant box</a:documentation>
   <!--
     ==========================================
     main block: <installmedia>
-    
+
   -->
   <div>
     <sch:pattern id="installation_media">
@@ -4994,7 +4994,7 @@ for the installation media of OEM images.</a:documentation>
   <!--
     ==========================================
     main block: <initrd>
-    
+
   -->
   <div>
     <define name="k.initrd.action.attribute">
@@ -5028,7 +5028,7 @@ for the installation media.</a:documentation>
   <!--
     ==========================================
     main block: <dracut>
-    
+
   -->
   <div>
     <define name="k.dracut.module.attribute">
@@ -5049,7 +5049,7 @@ for the installation media.</a:documentation>
   <!--
     ==========================================
     main block: <machine>
-    
+
   -->
   <div>
     <define name="k.machine.ovftype.attribute">
@@ -5201,7 +5201,7 @@ running the image.</a:documentation>
   <!--
     ==========================================
     main block: <packages>
-    
+
   -->
   <div>
     <sch:pattern abstract="true" id="packages_type">
@@ -5308,7 +5308,7 @@ alternative bootstrap method for debootstrap</a:documentation>
   <!--
     ==========================================
     main block: <preferences>
-    
+
   -->
   <div>
     <define name="k.preferences.profiles.attribute">
@@ -5381,7 +5381,7 @@ definition</a:documentation>
   <!--
     ==========================================
     main block: <profiles>
-    
+
   -->
   <div>
     <define name="k.profiles.attlist">
@@ -5403,7 +5403,7 @@ drivers can bind itself to one of the listed namespaces.</a:documentation>
   <!--
     ==========================================
     main block: <users>
-    
+
   -->
   <div>
     <define name="k.users.profiles.attribute">