mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-23 23:52:58 +00:00
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 675ebbc355382deb38fccae00408f915ff183061 Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
Date: Fri, 29 May 2020 04:04:44 +0300
|
|
Subject: [PATCH 04/12] Leave /etc/vconsole.conf not changed
|
|
|
|
1. eurlatgr font is not universal and does not cupport cyrillic characters
|
|
https://github.com/livecd-tools/livecd-tools/issues/159
|
|
2. We patch systemd to run setfont despite empty /etc/vconsole.conf
|
|
https://github.com/systemd/systemd/pull/15479
|
|
This patch can be dropped in the future, however.
|
|
---
|
|
imgcreate/kickstart.py | 16 +---------------
|
|
1 file changed, 1 insertion(+), 15 deletions(-)
|
|
|
|
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
|
|
index f1a24ed..ef51395 100644
|
|
--- a/imgcreate/kickstart.py
|
|
+++ b/imgcreate/kickstart.py
|
|
@@ -141,21 +141,7 @@ class LanguageConfig(KickstartConfig):
|
|
class KeyboardConfig(KickstartConfig):
|
|
"""A class to apply a kickstart keyboard configuration to a system."""
|
|
def apply(self, kskeyboard):
|
|
- vcconf_file = self.path("/etc/vconsole.conf")
|
|
- DEFAULT_VC_FONT = "eurlatgr"
|
|
-
|
|
- if not kskeyboard.keyboard:
|
|
- kskeyboard.keyboard = "us"
|
|
-
|
|
- try:
|
|
- with open(vcconf_file, "w") as f:
|
|
- f.write('KEYMAP="%s"\n' % kskeyboard.keyboard)
|
|
-
|
|
- # systemd now defaults to a font that cannot display non-ascii
|
|
- # characters, so we have to tell it to use a better one
|
|
- f.write('FONT="%s"\n' % DEFAULT_VC_FONT)
|
|
- except IOError as e:
|
|
- logging.error("Cannot write vconsole configuration file: %s" % e)
|
|
+ return True
|
|
|
|
class TimezoneConfig(KickstartConfig):
|
|
"""A class to apply a kickstart timezone configuration to a system."""
|
|
--
|
|
2.31.1
|
|
|