| -rw-r--r-- | components/liveinstall.xml | 7 | ||||
| -rw-r--r-- | grub-arm.cfg.iso-template | 6 | ||||
| -rw-r--r-- | grub-ppc.cfg.iso-template | 6 | ||||
| -rw-r--r-- | grub-x86.cfg.iso-template | 6 |
4 files changed, 6 insertions, 19 deletions
diff --git a/components/liveinstall.xml b/components/liveinstall.xml index c870f87..b847eac 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="true" + primary="true" flags="dmsquash" mediacheck="false" 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="true" + primary="true" flags="dmsquash" mediacheck="false" 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="true" + primary="true" flags="dmsquash" mediacheck="false" firmware="ofw" kernelcmdline="quiet rhgb" > <bootloader name="grub2" grub_template="grub-ppc.cfg.iso-template" console="console" timeout="10"/> @@ -41,7 +41,6 @@ <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 037ae79..e24dd2d 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="1" +set default=${default_boot} function load_video { insmod efi_gop @@ -29,10 +29,6 @@ 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 26cd610..3ed12bb 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="1" +set default=${default_boot} insmod gzio insmod part_gpt @@ -18,10 +18,6 @@ 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 9b779bd..ca3a1c1 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="1" +set default=${default_boot} if [ "$$grub_platform" == "efi" ]; then function load_video { @@ -36,10 +36,6 @@ 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} |