Merge branch 'SLE-15-SP1' into 'master'

yast · Apr 20, 2020 · 8e9f7a0 · 8e9f7a0
2 parents 1189cac + a6138b6
commit 8e9f7a0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 20 12:10:19 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Force the use of en_US.UTF-8 when running firstboot or the
+  AutoYaST Second Stage with 'POSIX' or 'C as RC_LANG (bsc#1169017)
+- 4.2.41
+
 -------------------------------------------------------------------
 Fri Mar 20 14:04:48 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.2.40
+Version:        4.2.41
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

diff --git a/startup/common/language.sh b/startup/common/language.sh
@@ -73,8 +73,13 @@ function set_language_cont () {
                 export RC_LANG=en_US
         fi
 
-        # get rid of encoding and/or modifier
-        export LANG=${RC_LANG%%[.@]*}.UTF-8
+        if [ "$RC_LANG" == "POSIX" ] || [ "$RC_LANG" == "C" ] ; then
+                log "\tRC_LANG is ${RC_LANG}, using LANG en_US.UTF-8 as default..."
+                export LANG=en_US.UTF-8
+        else
+                # get rid of encoding and/or modifier
+                export LANG=${RC_LANG%%[.@]*}.UTF-8
+        fi
 }
 
 #----[ start_unicode ]-----#