richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 5e6503d0d2efb5cbff945df42423640ffb138073 Mon Sep 17 00:00:00 2001
803fb7
From: Jan Engelhardt <jengelh@inai.de>
803fb7
Date: Tue, 24 Feb 2015 17:49:02 +0100
803fb7
Subject: [PATCH] vconsole: match on vtcon events, not fbcon ones
803fb7
803fb7
I observe that upon loading of framebuffer drivers, I do not get the
803fb7
desired system font, but the kernel-level defaults (usually
803fb7
lib/fonts/font_8x16.c, but your mileage may vary depending on kernel
803fb7
config and boot options).
803fb7
803fb7
The fbcon driver may be loaded at a time way before the first
803fb7
framebuffer device is active, such that the vconsole setup helper
803fb7
runs too early.
803fb7
803fb7
The existing rule is non-fitting. The going live of the fbcon kernel
803fb7
component does not indicate the proper time at which to load the
803fb7
visuals, which really ought to be done when a new vtcon object comes
803fb7
into existence. (The font table is a per-vtcon property.)
803fb7
803fb7
(cherry picked from commit a52750d1483ff139df33149afc0b675531e9cd79)
803fb7
---
803fb7
 src/vconsole/90-vconsole.rules.in | 7 +++----
803fb7
 1 file changed, 3 insertions(+), 4 deletions(-)
803fb7
803fb7
diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in
803fb7
index 062009640..35b9ad515 100644
803fb7
--- a/src/vconsole/90-vconsole.rules.in
803fb7
+++ b/src/vconsole/90-vconsole.rules.in
803fb7
@@ -5,7 +5,6 @@
803fb7
 #  the Free Software Foundation; either version 2.1 of the License, or
803fb7
 #  (at your option) any later version.
803fb7
 
803fb7
-# Kernel resets vconsole state when changing console drivers so run
803fb7
-# systemd-vconsole-setup when fbcon loads
803fb7
-
803fb7
-ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fbcon", RUN+="@rootlibexecdir@/systemd-vconsole-setup"
803fb7
+# Each vtcon keeps its own state of fonts.
803fb7
+#
803fb7
+ACTION=="add", SUBSYSTEM=="vtconsole", KERNEL=="vtcon*", RUN+="@rootlibexecdir@/systemd-vconsole-setup"