From f9fbfc24e0bca31452f96e138fb163a623328c5d Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Tue, 27 Aug 2024 15:53:33 -0400
Subject: components/liveinstall: Enable mediacheck for live ISOs

This brings us to full parity with official Fedora ISOs produced
by Lorax.
---
 components/liveinstall.xml | 7 ++++---
 grub-arm.cfg.iso-template  | 6 +++++-
 grub-ppc.cfg.iso-template  | 6 +++++-
 grub-x86.cfg.iso-template  | 6 +++++-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index b847eac..c870f87 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -7,7 +7,7 @@
 	<preferences profiles="LiveInstall" arch="x86_64">
 		<type image="iso"
 			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" mediacheck="false"
+			primary="true" flags="dmsquash" mediacheck="true"
 			firmware="uefi" efifatimagesize="30" kernelcmdline="quiet rhgb"
 			>
 			<bootloader name="grub2" grub_template="grub-x86.cfg.iso-template" console="console" timeout="10"/>
@@ -16,7 +16,7 @@
 	<preferences profiles="LiveInstall" arch="aarch64">
 		<type image="iso"
 			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" mediacheck="false"
+			primary="true" flags="dmsquash" mediacheck="true"
 			firmware="uefi" efifatimagesize="30" kernelcmdline="quiet rhgb"
 			>
 			<bootloader name="grub2" grub_template="grub-arm.cfg.iso-template" console="console" timeout="10"/>
@@ -25,7 +25,7 @@
 	<preferences profiles="LiveInstall" arch="ppc64le">
 		<type image="iso"
 			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" mediacheck="false"
+			primary="true" flags="dmsquash" mediacheck="true"
 			firmware="ofw" kernelcmdline="quiet rhgb"
 			>
 			<bootloader name="grub2" grub_template="grub-ppc.cfg.iso-template" console="console" timeout="10"/>
@@ -41,6 +41,7 @@
 		<package name="aajohan-comfortaa-fonts"/>
 		<package name="dracut-live"/>
 		<package name="glibc-all-langpacks"/>
+		<package name="isomd5sum"/>
 		<package name="kernel"/>
 		<package name="kernel-modules"/>
 		<package name="kernel-modules-extra"/>
diff --git a/grub-arm.cfg.iso-template b/grub-arm.cfg.iso-template
index e24dd2d..037ae79 100644
--- a/grub-arm.cfg.iso-template
+++ b/grub-arm.cfg.iso-template
@@ -1,6 +1,6 @@
 # Inspired by the config used for lorax-built live media
 
-set default=${default_boot}
+set default="1"
 
 function load_video {
 	insmod efi_gop
@@ -29,6 +29,10 @@ menuentry "Start ${title}" --class fedora --class gnu-linux --class gnu --class
 	linux ($$root)${bootpath}/${kernel_file} ${boot_options}
 	initrd ($$root)${bootpath}/${initrd_file}
 }
+menuentry "Test this media & start ${title}" --class fedora --class gnu-linux --class gnu --class os {
+	linux ($$root)${bootpath}/${kernel_file} ${boot_options} rd.live.check
+	initrd ($$root)${bootpath}/${initrd_file}
+}
 submenu "Troubleshooting -->" {
 	menuentry "Start ${title} in basic graphics mode" --class fedora --class gnu-linux --class gnu --class os {
 		linux ($$root)${bootpath}/${kernel_file} ${boot_options} $${basicgfx}
diff --git a/grub-ppc.cfg.iso-template b/grub-ppc.cfg.iso-template
index 3ed12bb..26cd610 100644
--- a/grub-ppc.cfg.iso-template
+++ b/grub-ppc.cfg.iso-template
@@ -1,6 +1,6 @@
 # Inspired by the config used for lorax-built live media
 
-set default=${default_boot}
+set default="1"
 
 insmod gzio
 insmod part_gpt
@@ -18,6 +18,10 @@ menuentry "Start ${title}" --class fedora --class gnu-linux --class gnu --class
 	linux ($$root)${bootpath}/${kernel_file} ${boot_options}
 	initrd ($$root)${bootpath}/${initrd_file}
 }
+menuentry "Test this media & start ${title}" --class fedora --class gnu-linux --class gnu --class os {
+	linux ($$root)${bootpath}/${kernel_file} ${boot_options} rd.live.check
+	initrd ($$root)${bootpath}/${initrd_file}
+}
 submenu "Troubleshooting -->" {
 	menuentry "Start ${title} in basic graphics mode" --class fedora --class gnu-linux --class gnu --class os {
 		linux ($$root)${bootpath}/${kernel_file} ${boot_options} $${basicgfx}
diff --git a/grub-x86.cfg.iso-template b/grub-x86.cfg.iso-template
index ca3a1c1..9b779bd 100644
--- a/grub-x86.cfg.iso-template
+++ b/grub-x86.cfg.iso-template
@@ -1,6 +1,6 @@
 # Inspired by the config used for lorax-built live media
 
-set default=${default_boot}
+set default="1"
 
 if [ "$$grub_platform" == "efi" ]; then
 	function load_video {
@@ -36,6 +36,10 @@ menuentry "Start ${title}" --class fedora --class gnu-linux --class gnu --class
 	linux ($$root)${bootpath}/${kernel_file} ${boot_options}
 	initrd ($$root)${bootpath}/${initrd_file}
 }
+menuentry "Test this media & start ${title}" --class fedora --class gnu-linux --class gnu --class os {
+	linux ($$root)${bootpath}/${kernel_file} ${boot_options} rd.live.check
+	initrd ($$root)${bootpath}/${initrd_file}
+}
 submenu "Troubleshooting -->" {
 	menuentry "Start ${title} in basic graphics mode" --class fedora --class gnu-linux --class gnu --class os {
 		linux ($$root)${bootpath}/${kernel_file} ${boot_options} $${basicgfx}
-- 
cgit v1.3.1+13