From 230e47abffe03fcb714de1f13c4c15a7119288d1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Sun, 9 Jun 2019 12:37:37 +0100
Subject: [PATCH] SoaS: use -N for dracut regeneration to ensure generic initrd

Minor other ordering and cleanup. Should fix issues for having host
specific initrd due to having already removed dracut-config-generic.
---
 fedora-soas-common.ks | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fedora-soas-common.ks b/fedora-soas-common.ks
index 07f535a..7db9e1f 100644
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -89,20 +89,20 @@ sugar-logos
 
 %post
 
-# Rebuild initrd for Sugar boot screen
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-/usr/sbin/plymouth-set-default-theme sugar
-dracut -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*
-
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
 Sugar on a Stick
 EOF
 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
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 # Add our activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << EOF
 org.laptop.WebActivity