From a5374eb603f9aabee8d555442dacddacd1023333 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 23 Apr 2018 15:46:44 +0200 Subject: [PATCH 1/3] adapt Rakefile and Dockerfile for SLE-12-SP4 --- Dockerfile | 3 ++- Rakefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1486731..57e75e9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ -FROM yastdevel/ruby:sle12-sp3 +FROM yastdevel/ruby:sle12-sp4 + COPY . /usr/src/app diff --git a/Rakefile b/Rakefile index c684d048..8502314a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ require "yast/rake" -Yast::Tasks.submit_to :sle12sp3 +Yast::Tasks.submit_to :sle12sp4 Yast::Tasks.configuration do |conf| #lets ignore license check for now From 6befffd894ee4bdbbbab95bdc1e98cbc8fad30a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 3 Aug 2018 13:24:40 +0100 Subject: [PATCH 2/3] Fallback to default language is not defined in RC_LANG and firstboot --- language/src/modules/Language.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/language/src/modules/Language.rb b/language/src/modules/Language.rb index 4d831ada..0dbc5ad9 100644 --- a/language/src/modules/Language.rb +++ b/language/src/modules/Language.rb @@ -545,7 +545,7 @@ def SetDefault nil end - # Read the RC_LANG value from sysconfig and exctract language from it + # Read the RC_LANG value from sysconfig and extract language from it # @return language def ReadSysconfigLanguage local_lang = Misc.SysconfigRead( @@ -635,6 +635,10 @@ def Language SetDefault() # also default else local_lang = ReadSysconfigLanguage() + # Fallback to the default if not defined one (bsc#1103397) + if Stage.firstboot && local_lang.empty? + local_lang = DEFAULT_FALLBACK_LANGUAGE + end QuickSet(local_lang) SetDefault() # also default if Mode.live_installation || Stage.firstboot From 2277647fcbe45be84765689f8e465e1301f97ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Tue, 7 Aug 2018 14:00:27 +0100 Subject: [PATCH 3/3] Bump version & changelog. --- package/yast2-country.changes | 7 +++++++ package/yast2-country.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-country.changes b/package/yast2-country.changes index 8a9267d3..cf52d56d 100644 --- a/package/yast2-country.changes +++ b/package/yast2-country.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 7 12:00:24 UTC 2018 - knut.anderssen@suse.com + +- Fallback to the default language during the firstboot if the + sysconfig RC_LANG is empty (bsc#1103397) +- 3.2.15 + ---------------------------------------------------------------- Wed Dec 13 13:48:06 CET 2017 - schubi@suse.de diff --git a/package/yast2-country.spec b/package/yast2-country.spec index 3a215be3..c5245f8f 100644 --- a/package/yast2-country.spec +++ b/package/yast2-country.spec @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.2.14 +Version: 3.2.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build