efi initramfs

2 files changed, 12 insertions, 4 deletions

diff --git a/scripts/install-redhat.sh b/scripts/install-redhat.sh
index 2abf761..39a2b4d 100755
--- a/scripts/install-redhat.sh
+++ b/scripts/install-redhat.sh
@@ -172,7 +172,7 @@ msg "dnf install packages to $dest ..."
 (set -x; sudo $tool $quiet install $inst)				|| exit 1
 if test "$krnl" != ""; then
 	msg "dnf install $krnl to $dest ..."
-	(set -x; sudo $tool install $krnl)				|| exit 1
+	(set -x; sudo $tool $quiet install $krnl)			|| exit 1
 fi
 sudo rm -rf "${dest}/var/cache/"{dnf,yum}
 
diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh
index 9bb189f..fbd4c8f 100755
--- a/scripts/tar-to-image.sh
+++ b/scripts/tar-to-image.sh
@@ -197,6 +197,16 @@ EOF
 }
 
 function fish_grub2_efi() {
+	msg "boot setup (root=${rootfs})"
+	kver=$(guestfish --remote -- ls /boot \
+		| grep -e "^vmlinuz-" | grep -v rescue \
+		| sed -e "s/vmlinuz-//")
+	echo "### kernel version is $kver"
+
+	echo "### rebuilding initramfs"
+	fish command "dracut --force /boot/initramfs-${kver}.img ${kver}"
+
+	echo "### create grub2 boot loader config"
 	cat <<-EOF > "$grubdef"
 	GRUB_TIMEOUT="5"
 	GRUB_TERMINAL_OUTPUT="console"
@@ -204,9 +214,7 @@ function fish_grub2_efi() {
 	GRUB_DISABLE_RECOVERY="true"
 	GRUB_CMDLINE_LINUX="ro root=${rootfs}"
 EOF
-
-	msg "create grub2 boot loader config (root=${rootfs})"
-	fish copy-in	$grubdef /etc/default
+	fish copy-in $grubdef /etc/default
 	fish command "grub2-mkconfig -o /etc/grub2-efi.cfg"
 	fish command "sed -i -c -e s/linux16/linuxefi/ /etc/grub2-efi.cfg"
 	fish command "sed -i -c -e s/initrd16/initrdefi/ /etc/grub2-efi.cfg"