From 883f4efa8ec745fcae3a7befd4bc629e829a9ab4 Mon Sep 17 00:00:00 2001
From: Frederick Grose <fgrose@sugarlabs.org>
Date: Thu, 2 Feb 2023 13:15:35 -0500
Subject: [PATCH] fedora-soas-common: Restore plymouth to initrd for boot
 animation.

Override the omission of the plymouth module for rebuilding the
initrd.  Copy the initrd image to the live boot image directory.
---
 fedora-soas-common.ks | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/fedora-soas-common.ks b/fedora-soas-common.ks
index 18f4099..2f3702d 100644
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -78,7 +78,8 @@ cat /etc/fedora-release >> /boot/olpc_build
 # Rebuild initrd for Sugar boot screen
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
 /usr/sbin/plymouth-set-default-theme sugar
-dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+sed -i -r 's/(omit_dracutmodules\+\=.*) plymouth (.*)/\1 \2/' /etc/dracut.conf.d/99-liveos.conf
+dracut --force-add plymouth -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
 
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
@@ -109,3 +110,14 @@ EOF
 /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end
+
+%post --nochroot
+
+for n in initramfs initrd; do
+    for img in "$LIVE_ROOT/images/pxeboot/$n"* ; do
+        [ -e "$img" ] && cp -a "$INSTALL_ROOT"/boot/initramfs-*.img "$img"
+    done
+done
+
+%end
+