Merge pull request #2341 from leifliddy/master

add GRUB_TIMEOUT_STYLE=menu option

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,15 +70,15 @@ 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
         & ( k.image.noNamespaceSchemaLocation.attribute?
             | 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+
@@ -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" ]
@@ -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 &