Jan Synacek d79509
From f6ba8671d83f9fce9a00045d8fa399a1c07ba7fc Mon Sep 17 00:00:00 2001
Jan Synacek d79509
From: Ray Strode <rstrode@redhat.com>
Jan Synacek d79509
Date: Wed, 5 Nov 2014 08:30:52 -0500
Jan Synacek d79509
Subject: [PATCH] login: rerun vconsole-setup when switching from vgacon to
Jan Synacek d79509
 fbcon
Jan Synacek d79509
Jan Synacek d79509
The initialization performed by systemd-vconsole-setup is reset
Jan Synacek d79509
when changing console drivers (say from vgacon to fbcon), so we
Jan Synacek d79509
need to run it in that case.
Jan Synacek d79509
Jan Synacek d79509
See
Jan Synacek d79509
http://lists.freedesktop.org/archives/systemd-devel/2014-October/023919.html
Jan Synacek d79509
http://lists.freedesktop.org/archives/systemd-devel/2014-October/024423.html
Jan Synacek d79509
http://lists.freedesktop.org/archives/systemd-devel/2014-November/024881.html
Jan Synacek d79509
Jan Synacek d79509
This commit adds a udev rule to make systemd-vconsole-setup get run when
Jan Synacek d79509
the fbcon device becomes available.
Jan Synacek d79509
Jan Synacek d79509
(david: moved into new file 90-vconsole.rules instead of 71-seats.rules;
Jan Synacek d79509
        build-failures are on me, not on Ray)
Jan Synacek d79509
---
Jan Synacek d79509
 Makefile.am                    |  3 +++
Jan Synacek d79509
 src/vconsole/90-vconsole.rules | 11 +++++++++++
Jan Synacek d79509
 2 files changed, 14 insertions(+)
Jan Synacek d79509
 create mode 100644 src/vconsole/90-vconsole.rules
Jan Synacek d79509
Jan Synacek d79509
diff --git a/Makefile.am b/Makefile.am
Jan Synacek d79509
index 3686103..f614b86 100644
Jan Synacek d79509
--- a/Makefile.am
Jan Synacek d79509
+++ b/Makefile.am
Jan Synacek d79509
@@ -4439,6 +4439,9 @@ rootlibexec_PROGRAMS += \
Jan Synacek d79509
 nodist_systemunit_DATA += \
Jan Synacek d79509
 	units/systemd-vconsole-setup.service
Jan Synacek d79509
 
Jan Synacek d79509
+dist_udevrules_DATA += \
Jan Synacek d79509
+	src/vconsole/90-vconsole.rules
Jan Synacek d79509
+
Jan Synacek d79509
 SYSINIT_TARGET_WANTS += \
Jan Synacek d79509
 	systemd-vconsole-setup.service
Jan Synacek d79509
 endif
Jan Synacek d79509
diff --git a/src/vconsole/90-vconsole.rules b/src/vconsole/90-vconsole.rules
Jan Synacek d79509
new file mode 100644
Jan Synacek d79509
index 0000000..bf6a9ef
Jan Synacek d79509
--- /dev/null
Jan Synacek d79509
+++ b/src/vconsole/90-vconsole.rules
Jan Synacek d79509
@@ -0,0 +1,11 @@
Jan Synacek d79509
+#  This file is part of systemd.
Jan Synacek d79509
+#
Jan Synacek d79509
+#  systemd is free software; you can redistribute it and/or modify it
Jan Synacek d79509
+#  under the terms of the GNU Lesser General Public License as published by
Jan Synacek d79509
+#  the Free Software Foundation; either version 2.1 of the License, or
Jan Synacek d79509
+#  (at your option) any later version.
Jan Synacek d79509
+
Jan Synacek d79509
+# Kernel resets vconsole state when changing console drivers so run
Jan Synacek d79509
+# systemd-vconsole-setup when fbcon loads
Jan Synacek d79509
+
Jan Synacek d79509
+ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fbcon", RUN+="/usr/lib/systemd/systemd-vconsole-setup"
Jan Synacek d79509
-- 
Jan Synacek d79509
1.9.3
Jan Synacek d79509