From 4591de6ddef1061f5bd5a4f4aa03e53a8fb9d2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 14 Mar 2014 01:45:59 +0100
Subject: [PATCH] plymouth: include 'label' plugin for text messages rendering

---
 qubes-logos/plymouth/plymouth-missing-fonts.conf | 8 ++++++++
 qubes-logos/qubes-logos.spec                     | 4 ++++
 2 files changed, 12 insertions(+)
 create mode 100644 qubes-logos/plymouth/plymouth-missing-fonts.conf

diff --git a/qubes-logos/plymouth/plymouth-missing-fonts.conf b/qubes-logos/plymouth/plymouth-missing-fonts.conf
new file mode 100644
index 0000000..dc48f8c
--- /dev/null
+++ b/qubes-logos/plymouth/plymouth-missing-fonts.conf
@@ -0,0 +1,8 @@
+install_items+=" /usr/share/fonts/dejavu/DejaVuSans.ttf "
+install_items+=" /usr/share/fonts/dejavu/DejaVuSerif.ttf "
+install_items+=" /usr/share/fontconfig/conf.avail/57-dejavu-sans.conf "
+install_items+=" /etc/fonts/conf.d/57-dejavu-sans.conf "
+install_items+=" /etc/fonts/fonts.conf "
+# This unfortunately pulls about 10MB of libraries into initrd, but what can we
+# do... without this, the 'script' plugin cannot output any text message
+install_items+=" $(plymouth --get-splash-plugin-path)/label.so "
diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec
index b6b2d30..d1e72f8 100644
--- a/qubes-logos/qubes-logos.spec
+++ b/qubes-logos/qubes-logos.spec
@@ -24,6 +24,7 @@ Conflicts: redhat-artwork <= 5.0.5
 # For _kde4_appsdir macro:
 BuildRequires: kde-filesystem
 Requires: plymouth-plugin-script
+Requires: plymouth-plugin-label
 # For plymouth-set-default-theme
 Requires(post): plymouth-scripts
 
@@ -70,6 +71,8 @@ for k in charge qubes; do
     done
 done
 install -p -m 644 plymouth/plymouthd.defaults.qubes $RPM_BUILD_ROOT%{_datadir}/plymouth
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d
+install -p -m 644 plymouth/plymouth-missing-fonts.conf $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d
 
 install -D icons/96-logo.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps/qubes-logo-icon.png
 
@@ -97,6 +100,7 @@ cp -f %{_datadir}/plymouth/plymouthd.defaults.qubes %{_datadir}/plymouth/plymout
 %{_datadir}/pixmaps/splash/*
 %{_datadir}/icons/hicolor/96x96/apps/qubes-logo-icon.png
 /usr/lib/anaconda-runtime/*.jpg
+%{_sysconfdir}/dracut.conf.d/plymouth-missing-fonts.conf
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 # should be ifarch i386
 /boot/grub/splash.xpm.gz