[systemd/f21] unicode_start is not started on boot (#1150384)

[jsynacek]

commit d79509b588413271f61aa481ab1898012d40e2a6
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Thu Nov 27 10:43:03 2014 +0100

    unicode_start is not started on boot (#1150384)

 ...-vconsole-setup-when-switching-from-vgaco.patch |   60 ++++++++++++++++++++
 systemd.spec                                       |    6 ++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/0047-login-rerun-vconsole-setup-when-switching-from-vgaco.patch b/0047-login-rerun-vconsole-setup-when-switching-from-vgaco.patch
new file mode 100644
index 0000000..51fb622
--- /dev/null
+++ b/0047-login-rerun-vconsole-setup-when-switching-from-vgaco.patch
@@ -0,0 +1,60 @@
+From f6ba8671d83f9fce9a00045d8fa399a1c07ba7fc Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 5 Nov 2014 08:30:52 -0500
+Subject: [PATCH] login: rerun vconsole-setup when switching from vgacon to
+ fbcon
+
+The initialization performed by systemd-vconsole-setup is reset
+when changing console drivers (say from vgacon to fbcon), so we
+need to run it in that case.
+
+See
+http://lists.freedesktop.org/archives/systemd-devel/2014-October/023919.html
+http://lists.freedesktop.org/archives/systemd-devel/2014-October/024423.html
+http://lists.freedesktop.org/archives/systemd-devel/2014-November/024881.html
+
+This commit adds a udev rule to make systemd-vconsole-setup get run when
+the fbcon device becomes available.
+
+(david: moved into new file 90-vconsole.rules instead of 71-seats.rules;
+        build-failures are on me, not on Ray)
+---
+ Makefile.am                    |  3 +++
+ src/vconsole/90-vconsole.rules | 11 +++++++++++
+ 2 files changed, 14 insertions(+)
+ create mode 100644 src/vconsole/90-vconsole.rules
+
+diff --git a/Makefile.am b/Makefile.am
+index 3686103..f614b86 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4439,6 +4439,9 @@ rootlibexec_PROGRAMS += \
+ nodist_systemunit_DATA += \
+ 	units/systemd-vconsole-setup.service
+ 
++dist_udevrules_DATA += \
++	src/vconsole/90-vconsole.rules
++
+ SYSINIT_TARGET_WANTS += \
+ 	systemd-vconsole-setup.service
+ endif
+diff --git a/src/vconsole/90-vconsole.rules b/src/vconsole/90-vconsole.rules
+new file mode 100644
+index 0000000..bf6a9ef
+--- /dev/null
++++ b/src/vconsole/90-vconsole.rules
+@@ -0,0 +1,11 @@
++#  This file is part of systemd.
++#
++#  systemd is free software; you can redistribute it and/or modify it
++#  under the terms of the GNU Lesser General Public License as published by
++#  the Free Software Foundation; either version 2.1 of the License, or
++#  (at your option) any later version.
++
++# Kernel resets vconsole state when changing console drivers so run
++# systemd-vconsole-setup when fbcon loads
++
++ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fbcon", RUN+="/usr/lib/systemd/systemd-vconsole-setup"
+-- 
+1.9.3
+
diff --git a/systemd.spec b/systemd.spec
index 8ad78ca..b4d830f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        216
-Release:        11%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        12%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -87,6 +87,7 @@ Patch0043:      0043-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
 Patch0044:      0044-systemctl-when-invokes-as-reboot-f-sync.patch
 Patch0045:      0045-shared-create-files-even-if-the-SELinux-policy-has-n.patch
 Patch0046:      0046-shutdown-fix-arguments-to-run-initramfs-shutdown.patch
+Patch0047:      0047-login-rerun-vconsole-setup-when-switching-from-vgaco.patch
 
 
 Patch0996:      Accept-StartTimeout-options-for-compatibility.patch
@@ -877,6 +878,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 %{_datadir}/systemd/gatewayd
 
 %changelog
+* Thu Nov 27 2014 Jan Synáček <jsynacek at redhat.com> - 216-12
+- unicode_start is not started on boot (#1150384)
+
 * Tue Nov 04 2014 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-11
 - Fixes for #1161100, #986667.
 - Fix udev timeout parsing.