From 8da813ecd22e0cd159418c197aaa45e7420fbecb Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 2 Mar 2021 21:16:53 +0100 Subject: [PATCH] rhel84: use en_US.UTF-8 as default for LANG Use en_US.UTF-8 as default for LANG, which is what previously was used and is also needed to properly work on non-us/latin setups[1]. In the customization tests, use a different value than the default one to check that the customization does in fact work. [1] http://git.app.eng.bos.redhat.com/git/spin-kickstarts.git/tree/rhel8/rhel-8.2-kvm-x86_64.ks#n4 Co-authored-by: Achilleas Koutsou --- internal/distro/rhel84/distro.go | 2 +- test/data/manifests/centos_8-x86_64-ami-boot.json | 2 +- test/data/manifests/centos_8-x86_64-openstack-boot.json | 2 +- test/data/manifests/centos_8-x86_64-qcow2-boot.json | 2 +- test/data/manifests/centos_8-x86_64-qcow2-customize.json | 4 ++-- test/data/manifests/centos_8-x86_64-tar-boot.json | 2 +- test/data/manifests/centos_8-x86_64-vhd-boot.json | 2 +- test/data/manifests/centos_8-x86_64-vmdk-boot.json | 2 +- test/data/manifests/fedora_32-x86_64-qcow2-customize.json | 4 ++-- test/data/manifests/fedora_33-x86_64-qcow2-customize.json | 4 ++-- test/data/manifests/rhel_8-x86_64-qcow2-customize.json | 4 ++-- test/data/manifests/rhel_84-aarch64-ami-boot.json | 2 +- test/data/manifests/rhel_84-aarch64-openstack-boot.json | 2 +- test/data/manifests/rhel_84-aarch64-qcow2-boot.json | 2 +- .../data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json | 2 +- test/data/manifests/rhel_84-aarch64-tar-boot.json | 2 +- test/data/manifests/rhel_84-ppc64le-qcow2-boot.json | 2 +- test/data/manifests/rhel_84-ppc64le-tar-boot.json | 2 +- test/data/manifests/rhel_84-s390x-qcow2-boot.json | 2 +- test/data/manifests/rhel_84-x86_64-ami-boot.json | 2 +- test/data/manifests/rhel_84-x86_64-openstack-boot.json | 2 +- test/data/manifests/rhel_84-x86_64-qcow2-boot.json | 2 +- test/data/manifests/rhel_84-x86_64-qcow2-customize.json | 4 ++-- test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json | 2 +- .../manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json | 2 +- test/data/manifests/rhel_84-x86_64-tar-boot.json | 2 +- test/data/manifests/rhel_84-x86_64-vhd-boot.json | 2 +- test/data/manifests/rhel_84-x86_64-vmdk-boot.json | 2 +- tools/test-case-generators/generate-test-cases | 2 +- 29 files changed, 34 insertions(+), 34 deletions(-) diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go index e4acbaa9e..5ca497ca6 100644 --- a/internal/distro/rhel84/distro.go +++ b/internal/distro/rhel84/distro.go @@ -313,7 +313,7 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp if language != nil { p.AddStage(osbuild.NewLocaleStage(&osbuild.LocaleStageOptions{Language: *language})) } else { - p.AddStage(osbuild.NewLocaleStage(&osbuild.LocaleStageOptions{Language: "en_US"})) + p.AddStage(osbuild.NewLocaleStage(&osbuild.LocaleStageOptions{Language: "en_US.UTF-8"})) } if keyboard != nil { diff --git a/test/data/manifests/centos_8-x86_64-ami-boot.json b/test/data/manifests/centos_8-x86_64-ami-boot.json index be839733a..9d0d1836f 100644 --- a/test/data/manifests/centos_8-x86_64-ami-boot.json +++ b/test/data/manifests/centos_8-x86_64-ami-boot.json @@ -3862,7 +3862,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/centos_8-x86_64-openstack-boot.json b/test/data/manifests/centos_8-x86_64-openstack-boot.json index b50a874d2..17db1db21 100644 --- a/test/data/manifests/centos_8-x86_64-openstack-boot.json +++ b/test/data/manifests/centos_8-x86_64-openstack-boot.json @@ -4162,7 +4162,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/centos_8-x86_64-qcow2-boot.json b/test/data/manifests/centos_8-x86_64-qcow2-boot.json index b483362ac..7ed902f66 100644 --- a/test/data/manifests/centos_8-x86_64-qcow2-boot.json +++ b/test/data/manifests/centos_8-x86_64-qcow2-boot.json @@ -4136,7 +4136,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/centos_8-x86_64-qcow2-customize.json b/test/data/manifests/centos_8-x86_64-qcow2-customize.json index 0bd91a782..560069981 100644 --- a/test/data/manifests/centos_8-x86_64-qcow2-customize.json +++ b/test/data/manifests/centos_8-x86_64-qcow2-customize.json @@ -74,7 +74,7 @@ }, "locale": { "languages": [ - "en_US" + "el_CY.UTF-8" ], "keyboard": "dvorak" }, @@ -4191,7 +4191,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "el_CY.UTF-8" } }, { diff --git a/test/data/manifests/centos_8-x86_64-tar-boot.json b/test/data/manifests/centos_8-x86_64-tar-boot.json index f4e1507de..3b1eea8dd 100644 --- a/test/data/manifests/centos_8-x86_64-tar-boot.json +++ b/test/data/manifests/centos_8-x86_64-tar-boot.json @@ -2371,7 +2371,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/centos_8-x86_64-vhd-boot.json b/test/data/manifests/centos_8-x86_64-vhd-boot.json index a08d1159b..21bb76217 100644 --- a/test/data/manifests/centos_8-x86_64-vhd-boot.json +++ b/test/data/manifests/centos_8-x86_64-vhd-boot.json @@ -4115,7 +4115,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/centos_8-x86_64-vmdk-boot.json b/test/data/manifests/centos_8-x86_64-vmdk-boot.json index 8a75a2a0c..9843846cf 100644 --- a/test/data/manifests/centos_8-x86_64-vmdk-boot.json +++ b/test/data/manifests/centos_8-x86_64-vmdk-boot.json @@ -3953,7 +3953,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/fedora_32-x86_64-qcow2-customize.json b/test/data/manifests/fedora_32-x86_64-qcow2-customize.json index a3ca6d0c0..4435e39a0 100644 --- a/test/data/manifests/fedora_32-x86_64-qcow2-customize.json +++ b/test/data/manifests/fedora_32-x86_64-qcow2-customize.json @@ -67,7 +67,7 @@ }, "locale": { "languages": [ - "en_US" + "el_CY.UTF-8" ], "keyboard": "dvorak" }, @@ -3433,7 +3433,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "el_CY.UTF-8" } }, { diff --git a/test/data/manifests/fedora_33-x86_64-qcow2-customize.json b/test/data/manifests/fedora_33-x86_64-qcow2-customize.json index 27ee224a8..0d54a8c81 100644 --- a/test/data/manifests/fedora_33-x86_64-qcow2-customize.json +++ b/test/data/manifests/fedora_33-x86_64-qcow2-customize.json @@ -67,7 +67,7 @@ }, "locale": { "languages": [ - "en_US" + "el_CY.UTF-8" ], "keyboard": "dvorak" }, @@ -3483,7 +3483,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "el_CY.UTF-8" } }, { diff --git a/test/data/manifests/rhel_8-x86_64-qcow2-customize.json b/test/data/manifests/rhel_8-x86_64-qcow2-customize.json index 2b8933e88..25bda22e4 100644 --- a/test/data/manifests/rhel_8-x86_64-qcow2-customize.json +++ b/test/data/manifests/rhel_8-x86_64-qcow2-customize.json @@ -70,7 +70,7 @@ }, "locale": { "languages": [ - "en_US" + "el_CY.UTF-8" ], "keyboard": "dvorak" }, @@ -3505,7 +3505,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "el_CY.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-aarch64-ami-boot.json b/test/data/manifests/rhel_84-aarch64-ami-boot.json index 60554b586..c8ad7a84b 100644 --- a/test/data/manifests/rhel_84-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_84-aarch64-ami-boot.json @@ -3217,7 +3217,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-aarch64-openstack-boot.json b/test/data/manifests/rhel_84-aarch64-openstack-boot.json index 94e32af9b..7e8801dd8 100644 --- a/test/data/manifests/rhel_84-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_84-aarch64-openstack-boot.json @@ -3453,7 +3453,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json index dea6c8c05..484b7c60f 100644 --- a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json @@ -3402,7 +3402,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json b/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json index fe35b4fa8..a4f6a7552 100644 --- a/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json +++ b/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json @@ -3015,7 +3015,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-aarch64-tar-boot.json b/test/data/manifests/rhel_84-aarch64-tar-boot.json index 463148d05..a5d195eee 100644 --- a/test/data/manifests/rhel_84-aarch64-tar-boot.json +++ b/test/data/manifests/rhel_84-aarch64-tar-boot.json @@ -1882,7 +1882,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json index c52d12687..8c684a469 100644 --- a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json @@ -3681,7 +3681,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-ppc64le-tar-boot.json b/test/data/manifests/rhel_84-ppc64le-tar-boot.json index 30a027f7e..32559f0e7 100644 --- a/test/data/manifests/rhel_84-ppc64le-tar-boot.json +++ b/test/data/manifests/rhel_84-ppc64le-tar-boot.json @@ -1921,7 +1921,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-s390x-qcow2-boot.json b/test/data/manifests/rhel_84-s390x-qcow2-boot.json index 1f2d58b37..87f723af6 100644 --- a/test/data/manifests/rhel_84-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_84-s390x-qcow2-boot.json @@ -3619,7 +3619,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-ami-boot.json b/test/data/manifests/rhel_84-x86_64-ami-boot.json index 57e50ec54..e0f78cc26 100644 --- a/test/data/manifests/rhel_84-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_84-x86_64-ami-boot.json @@ -3276,7 +3276,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-openstack-boot.json b/test/data/manifests/rhel_84-x86_64-openstack-boot.json index 624fca623..09cb374dc 100644 --- a/test/data/manifests/rhel_84-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_84-x86_64-openstack-boot.json @@ -3518,7 +3518,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json index 6537575c2..698435038 100644 --- a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json @@ -3449,7 +3449,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json index d3a134489..ecf58fd84 100644 --- a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json +++ b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json @@ -72,7 +72,7 @@ }, "locale": { "languages": [ - "en_US" + "el_CY.UTF-8" ], "keyboard": "dvorak" }, @@ -3497,7 +3497,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "el_CY.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json index 108737c31..b4d783586 100644 --- a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json +++ b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json @@ -3271,7 +3271,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json index c0872d058..d42d80f9c 100644 --- a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json @@ -3397,7 +3397,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-tar-boot.json b/test/data/manifests/rhel_84-x86_64-tar-boot.json index b0a788ab7..20671dfc5 100644 --- a/test/data/manifests/rhel_84-x86_64-tar-boot.json +++ b/test/data/manifests/rhel_84-x86_64-tar-boot.json @@ -1943,7 +1943,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json index 8cf13c786..9ba1dc16f 100644 --- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json @@ -3476,7 +3476,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json index 794489b49..9fca90499 100644 --- a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json @@ -3344,7 +3344,7 @@ { "name": "org.osbuild.locale", "options": { - "language": "en_US" + "language": "en_US.UTF-8" } }, { diff --git a/tools/test-case-generators/generate-test-cases b/tools/test-case-generators/generate-test-cases index 53a2f2242..25e55c9b6 100755 --- a/tools/test-case-generators/generate-test-cases +++ b/tools/test-case-generators/generate-test-cases @@ -153,7 +153,7 @@ CUSTOMIZATIONS_BLUEPRINT = { }, "locale": { "languages": [ - "en_US" + "el_CY.UTF-8" ], "keyboard": "dvorak" },