From b7a611d1d4400bb57a4dc0c72d99194815de43bf80eec94903c8bffd487e6bb5 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Fri, 25 Jan 2019 16:45:21 +0000
Subject: [PATCH] Accepting request 668711 from
 home:dmolkentin:branches:Base:System

- Remove invalid "FONT_MAP=none" from vconsole.conf (osc#1013573)

OBS-URL: https://build.opensuse.org/request/show/668711
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=362
---
 dracut.changes | 5 +++++
 dracut.spec    | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/dracut.changes b/dracut.changes
index f3c9f5f..4fa83e2 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 25 16:03:09 UTC 2019 - Daniel Molkentin <daniel.molkentin@suse.com>
+
+- Remove invalid "FONT_MAP=none" from vconsole.conf (osc#1013573) 
+
 -------------------------------------------------------------------
 Mon Jan 21 14:01:20 UTC 2019 - Daniel Molkentin <daniel.molkentin@suse.com>
 
diff --git a/dracut.spec b/dracut.spec
index 4fd6ec4..fd177d5 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -802,6 +802,10 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 %post
 %service_add_post purge-kernels.service
 %{?regenerate_initrd_post}
+# Due to a bug in YaST and subsequent work by the migration script, /etc/vconsole.conf
+# may contain "FONT_MAP=none" which is invalid. While systemd will silently ignore this,
+# dracut will complain. Eliminate the entry (bsc#1096771, bsc#1013573).
+sed -i '/^FONT_MAP=none/d' %{_sysconfdir}/vconsole.conf || : 
 
 %post fips
 %{?regenerate_initrd_post}