diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc index a6ddae0285..0c33b052ba 100644 --- a/kiwi/schema/kiwi.rnc +++ b/kiwi/schema/kiwi.rnc @@ -26,7 +26,7 @@ namespace nul = "" safe-posix-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]+"} safe-posix-short-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]{1,32}"} -safe-posix-long-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]{1,128}"} +ecma-119-achar-128-text = xsd:token {pattern = "[a-zA-Z0-9_\-\. ]{1,128}"} locale-name = xsd:token {pattern = "(POSIX|[a-z]{2,3}_[A-Z]{2})(,[a-z]{2,3}_[A-Z]{2})*"} mac-address-type = xsd:token {pattern = "([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}"} size-type = xsd:token {pattern = "(\d*|image)"} @@ -2145,7 +2145,7 @@ div { ## for the iso/(oem install iso) type only: ## Specifies the Application ID to be written ## into the master block. There is space for 128 characters. - attribute application_id { safe-posix-long-name } + attribute application_id { ecma-119-achar-128-text } >> sch:pattern [ id = "application_id" is-a = "image_type" sch:param [ name = "attr" value = "application_id" ] sch:param [ name = "types" value = "iso oem" ] @@ -2185,7 +2185,7 @@ div { ] k.type.publisher.attribute = ## Specifies the publisher name of the ISO. - attribute publisher { text } + attribute publisher { ecma-119-achar-128-text } >> sch:pattern [ id = "publisher" is-a = "image_type" sch:param [ name = "attr" value = "publisher" ] sch:param [ name = "types" value = "iso" ] diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng index b50bf6f790..6802a777a9 100644 --- a/kiwi/schema/kiwi.rng +++ b/kiwi/schema/kiwi.rng @@ -31,9 +31,9 @@ [a-zA-Z0-9_\-\.]{1,32} - + - [a-zA-Z0-9_\-\.]{1,128} + [a-zA-Z0-9_\-\. ]{1,128} @@ -3074,7 +3074,7 @@ into the master block. There is space for 32 characters. for the iso/(oem install iso) type only: Specifies the Application ID to be written into the master block. There is space for 128 characters. - + @@ -3128,6 +3128,7 @@ container image created by Kiwi. Default is true. Specifies the publisher name of the ISO. +