naccyde / rpms / systemd

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