From 39d2a16b861015116cba802745d06ff8a8cbc79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 17 Apr 2020 13:40:12 +0100 Subject: [PATCH 1/4] use LANG=UTF-8 in case of RC_LANG=POSIX --- startup/common/language.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/startup/common/language.sh b/startup/common/language.sh index 0e3396443..1cc5529a3 100644 --- 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" ] ; then + log "\tRC_LANG is POSIX, 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 ]-----# From 3d151c2e502dfcb6fc1c97a793179435da4a90f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 17 Apr 2020 15:30:23 +0100 Subject: [PATCH 2/4] Check also if RC_LANG is C --- startup/common/language.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/startup/common/language.sh b/startup/common/language.sh index 1cc5529a3..cc0c5ceac 100644 --- a/startup/common/language.sh +++ b/startup/common/language.sh @@ -73,8 +73,8 @@ function set_language_cont () { export RC_LANG=en_US fi - if [ "$RC_LANG" == "POSIX" ] ; then - log "\tRC_LANG is POSIX, using LANG en_US.UTF-8 as default..." + 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 From e0c906e6c46eed4ab7081d3fbc927b1664d8817e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 17 Apr 2020 17:17:50 +0100 Subject: [PATCH 3/4] Bump version & changelog --- package/yast2-installation.changes | 7 +++++++ package/yast2-installation.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 80719188d..fd8be2137 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 17 16:10:19 UTC 2020 - Knut Anderssen + +- 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) +- 3.3.0.4 + ------------------------------------------------------------------- Fri Mar 15 13:22:58 UTC 2019 - snwint@suse.com diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 6eed26443..5f1137223 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.3.0.3 +Version: 3.3.0.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build From a6aa384383d61ff131f886be6151bc8edb461ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 17 Apr 2020 22:14:06 +0100 Subject: [PATCH 4/4] Change version based on CR --- package/yast2-installation.changes | 2 +- package/yast2-installation.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index fd8be2137..4fec260ed 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -3,7 +3,7 @@ Fri Apr 17 16:10:19 UTC 2020 - Knut Anderssen - 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) -- 3.3.0.4 +- 3.3.1 ------------------------------------------------------------------- Fri Mar 15 13:22:58 UTC 2019 - snwint@suse.com diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 5f1137223..ba28fca3d 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.3.0.4 +Version: 3.3.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build