zbyszek pushed to systemd (f21). "Fix patch botched in last update"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 18:01:10 UTC 2015
>From dd3834a439fc0f293f0448ec729e1afb7a1e1e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
Date: Fri, 27 Mar 2015 13:57:58 -0400
Subject: Fix patch botched in last update
diff --git a/0266-Revert-vconsole-match-on-vtcon-events-not-fbcon-ones.patch b/0266-Revert-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
new file mode 100644
index 0000000..c013c1e
--- /dev/null
+++ b/0266-Revert-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
@@ -0,0 +1,27 @@
+From 317ca85db08beaef6d786fa5858bd1de559b40e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Fri, 27 Mar 2015 13:51:41 -0400
+Subject: [PATCH] Revert "vconsole: match on vtcon events, not fbcon ones"
+
+This reverts commit b71cdaca9ba538ad54c6880d025fc478a1af087e.
+
+The file got renamed in the meanwhile.
+---
+ src/vconsole/90-vconsole.rules | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/vconsole/90-vconsole.rules b/src/vconsole/90-vconsole.rules
+index 35b9ad5151..bf6a9efaa5 100644
+--- a/src/vconsole/90-vconsole.rules
++++ b/src/vconsole/90-vconsole.rules
+@@ -5,6 +5,7 @@
+ # the Free Software Foundation; either version 2.1 of the License, or
+ # (at your option) any later version.
+
+-# Each vtcon keeps its own state of fonts.
+-#
+-ACTION=="add", SUBSYSTEM=="vtconsole", KERNEL=="vtcon*", RUN+="@rootlibexecdir@/systemd-vconsole-setup"
++# 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"
diff --git a/0267-vconsole-don-t-hard-code-systemd-vconsole-setup-bina.patch b/0267-vconsole-don-t-hard-code-systemd-vconsole-setup-bina.patch
new file mode 100644
index 0000000..fbbb649
--- /dev/null
+++ b/0267-vconsole-don-t-hard-code-systemd-vconsole-setup-bina.patch
@@ -0,0 +1,57 @@
+From 64a51989b90b89a4cd3e908131dd8fac9e64a973 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sat, 29 Nov 2014 06:35:38 +0100
+Subject: [PATCH] vconsole: don't hard-code systemd-vconsole-setup binary path
+
+---
+ Makefile.am | 6 +++++-
+ src/vconsole/.gitignore | 1 +
+ src/vconsole/{90-vconsole.rules => 90-vconsole.rules.in} | 2 +-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+ create mode 100644 src/vconsole/.gitignore
+ rename src/vconsole/{90-vconsole.rules => 90-vconsole.rules.in} (79%)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1fbda3a48a..7e8973435d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4414,14 +4414,18 @@ rootlibexec_PROGRAMS += \
+ nodist_systemunit_DATA += \
+ units/systemd-vconsole-setup.service
+
+-dist_udevrules_DATA += \
++nodist_udevrules_DATA += \
+ src/vconsole/90-vconsole.rules
+
+ SYSINIT_TARGET_WANTS += \
+ systemd-vconsole-setup.service
++
++CLEANFILES += \
++ src/vconsole/90-vconsole.rules
+ endif
+
+ EXTRA_DIST += \
++ src/vconsole/90-vconsole.rules.in \
+ units/systemd-vconsole-setup.service.in
+
+ # ------------------------------------------------------------------------------
+diff --git a/src/vconsole/.gitignore b/src/vconsole/.gitignore
+new file mode 100644
+index 0000000000..82741b2fb3
+--- /dev/null
++++ b/src/vconsole/.gitignore
+@@ -0,0 +1 @@
++/90-vconsole.rules
+diff --git a/src/vconsole/90-vconsole.rules b/src/vconsole/90-vconsole.rules.in
+similarity index 79%
+rename from src/vconsole/90-vconsole.rules
+rename to src/vconsole/90-vconsole.rules.in
+index bf6a9efaa5..062009640c 100644
+--- a/src/vconsole/90-vconsole.rules
++++ b/src/vconsole/90-vconsole.rules.in
+@@ -8,4 +8,4 @@
+ # 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"
++ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fbcon", RUN+="@rootlibexecdir@/systemd-vconsole-setup"
diff --git a/0268-vconsole-match-on-vtcon-events-not-fbcon-ones.patch b/0268-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
new file mode 100644
index 0000000..dccee7d
--- /dev/null
+++ b/0268-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
@@ -0,0 +1,40 @@
+From 240c4b086839edfb1a72898453069d4a7427c666 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh at inai.de>
+Date: Tue, 24 Feb 2015 17:49:02 +0100
+Subject: [PATCH] vconsole: match on vtcon events, not fbcon ones
+
+I observe that upon loading of framebuffer drivers, I do not get the
+desired system font, but the kernel-level defaults (usually
+lib/fonts/font_8x16.c, but your mileage may vary depending on kernel
+config and boot options).
+
+The fbcon driver may be loaded at a time way before the first
+framebuffer device is active, such that the vconsole setup helper
+runs too early.
+
+The existing rule is non-fitting. The going live of the fbcon kernel
+component does not indicate the proper time at which to load the
+visuals, which really ought to be done when a new vtcon object comes
+into existence. (The font table is a per-vtcon property.)
+
+(cherry picked from commit a52750d1483ff139df33149afc0b675531e9cd79)
+(cherry picked from commit b83da13fffc79b5f4c1edaba3764f4d9be6993ff)
+---
+ src/vconsole/90-vconsole.rules.in | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in
+index 062009640c..35b9ad5151 100644
+--- a/src/vconsole/90-vconsole.rules.in
++++ b/src/vconsole/90-vconsole.rules.in
+@@ -5,7 +5,6 @@
+ # 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+="@rootlibexecdir@/systemd-vconsole-setup"
++# Each vtcon keeps its own state of fonts.
++#
++ACTION=="add", SUBSYSTEM=="vtconsole", KERNEL=="vtcon*", RUN+="@rootlibexecdir@/systemd-vconsole-setup"
diff --git a/systemd.spec b/systemd.spec
index f8617d3..ed4a07a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 216
-Release: 23%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release: 24%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -305,6 +305,9 @@ Patch0262: 0262-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch
Patch0263: 0263-timedated-flip-internal-status-after-executing-opera.patch
Patch0264: 0264-shared-add-path_compare-an-ordering-path-comparison.patch
Patch0265: 0265-core-namespace-fix-path-sorting.patch
+Patch0266: 0266-Revert-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
+Patch0267: 0267-vconsole-don-t-hard-code-systemd-vconsole-setup-bina.patch
+Patch0268: 0268-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
Patch0995: journald-when-we-detect-the-journal-file-we-are-abou.patch
@@ -1106,6 +1109,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_datadir}/systemd/gatewayd
%changelog
+* Fri Mar 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-24
+- Fix botched vconsole patch (#1206480).
+
* Sun Mar 22 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-23
- Move all parts systemd-journal-{remote,upload} to
systemd-journal-gatewayd subpackage (#1193143).
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/systemd.git/commit/?h=f21&id=dd3834a439fc0f293f0448ec729e1afb7a1e1e13
More information about the scm-commits
mailing list