diff --git a/SOURCES/0016-Set-cyrillic-font-by-default-in-console.patch b/SOURCES/0016-Set-cyrillic-font-by-default-in-console.patch index 779c6cf..05e1992 100644 --- a/SOURCES/0016-Set-cyrillic-font-by-default-in-console.patch +++ b/SOURCES/0016-Set-cyrillic-font-by-default-in-console.patch @@ -1,25 +1,50 @@ -From 39826dc46fd4b165a3a5caee0463742d6de10311 Mon Sep 17 00:00:00 2001 +From a297c582fe0dfb116273e043c7a5929860ad7372 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 15 Jul 2024 17:26:19 +0300 Subject: [PATCH 16/16] Set cyrillic font by default in console --- - pyanaconda/core/constants.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + pyanaconda/core/constants.py | 1 + + pyanaconda/modules/localization/installation.py | 7 +++++-- + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py -index b4622f9..143daf6 100644 +index b4622f9..2e58abc 100644 --- a/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py -@@ -81,7 +81,7 @@ ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf" - # NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8 +@@ -82,6 +82,7 @@ ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf" DEFAULT_LANG = "ru_RU.UTF-8" --DEFAULT_VC_FONT = "eurlatgr" -+DEFAULT_VC_FONT = "UniCyr_8x16" + DEFAULT_VC_FONT = "eurlatgr" ++DEFAULT_VC_RU_FONT = "UniCyr_8x16" DEFAULT_KEYBOARD = "us" +diff --git a/pyanaconda/modules/localization/installation.py b/pyanaconda/modules/localization/installation.py +index 4ebff66..c4a24b0 100644 +--- a/pyanaconda/modules/localization/installation.py ++++ b/pyanaconda/modules/localization/installation.py +@@ -21,7 +21,7 @@ import shutil + from pyanaconda.modules.common.errors.installation import LanguageInstallationError, \ + KeyboardInstallationError + from pyanaconda.modules.common.task import Task +-from pyanaconda.core.constants import DEFAULT_VC_FONT ++from pyanaconda.core.constants import DEFAULT_VC_FONT, DEFAULT_VC_RU_FONT + from pyanaconda.modules.localization.localed import get_missing_keyboard_configuration + from pyanaconda.anaconda_loggers import get_module_logger + +@@ -199,7 +199,10 @@ def write_vc_configuration(vc_keymap, root): + + # systemd now defaults to a font that cannot display non-ascii + # characters, so we have to tell it to use a better one +- fobj.write('FONT="%s"\n' % DEFAULT_VC_FONT) ++ if vc_keymap == "ru": ++ fobj.write('FONT="%s"\n' % DEFAULT_VC_RU_FONT) ++ else: ++ fobj.write('FONT="%s"\n' % DEFAULT_VC_FONT) + + except IOError as ioerr: + msg = "Cannot write vconsole configuration file: {}".format(ioerr.strerror) -- 2.45.2 diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 73aeb84..3b56e90 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 33.16.10.5 -Release: 1%{?dist}.inferit.2 +Release: 1%{?dist}.inferit.3 License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -391,6 +391,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Jul 16 2024 Arkady L. Shane - 33.16.10.5-1.inferit.3 +- Set cyrillic font only for russian keymap + * Mon Jul 15 2024 Arkady L. Shane - 33.16.10.5-1.inferit.2 - Set cyrillic font by default in console