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 <achilleas@koutsou.net>
2021-03-02 21:16:53 +01:00 · 2021-03-02 21:16:53 +01:00 · 8da813ecd2
commit 8da813ecd2
parent 130218778f
29 changed files with 34 additions and 34 deletions
--- 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 {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
          }
        },
        {
--- 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"
        },