Skip to content

Commit e1534c5

Browse files
committed
schema: Allow C as a valid locale
It should be permitted to set the "C.UTF-8" locale for minimal images that are not preloaded with locales. The "C.UTF-8" locale has been supported in Linux distributions for many years.
1 parent 5af510a commit e1534c5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

kiwi/schema/kiwi.rnc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace nul = ""
2727
safe-posix-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]+"}
2828
safe-posix-short-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]{1,32}"}
2929
ecma-119-achar-128-text = xsd:token {pattern = "[a-zA-Z0-9!-/:-?_ ]{1,128}"}
30-
locale-name = xsd:token {pattern = "(POSIX|[a-z]{2,3}_[A-Z]{2})(,[a-z]{2,3}_[A-Z]{2})*"}
30+
locale-name = xsd:token {pattern = "(C|POSIX|[a-z]{2,3}_[A-Z]{2})(,[a-z]{2,3}_[A-Z]{2})*"}
3131
mac-address-type = xsd:token {pattern = "([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}"}
3232
size-type = xsd:token {pattern = "(\d*|image)"}
3333
number-type = xsd:token {pattern = "\d+"}

kiwi/schema/kiwi.rng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</define>
3939
<define name="locale-name">
4040
<data type="token">
41-
<param name="pattern">(POSIX|[a-z]{2,3}_[A-Z]{2})(,[a-z]{2,3}_[A-Z]{2})*</param>
41+
<param name="pattern">(C|POSIX|[a-z]{2,3}_[A-Z]{2})(,[a-z]{2,3}_[A-Z]{2})*</param>
4242
</data>
4343
</define>
4444
<define name="mac-address-type">

0 commit comments

Comments
 (0)