daandemeyer / rpms / systemd

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