| -rw-r--r-- | components/liveinstall.xml | 25 | ||||
| -rw-r--r-- | grub-arm.cfg.iso-template | 37 | ||||
| -rw-r--r-- | grub-ppc.cfg.iso-template | 26 | ||||
| -rw-r--r-- | grub.cfg.iso-template (renamed from grub-x86.cfg.iso-template) | 0 |
4 files changed, 3 insertions, 85 deletions
diff --git a/components/liveinstall.xml b/components/liveinstall.xml index 065cbba..ca7106d 100644 --- a/components/liveinstall.xml +++ b/components/liveinstall.xml @@ -4,28 +4,9 @@ <requires profile="BootCore"/> </profile> </profiles> - <preferences profiles="LiveInstall" arch="x86_64"> - <type image="iso" - publisher="Fedora Project" volid="Fedora_Linux" 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"/> - </type> - </preferences> - <preferences profiles="LiveInstall" arch="aarch64"> - <type image="iso" - publisher="Fedora Project" volid="Fedora_Linux" 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"/> - </type> - </preferences> - <preferences profiles="LiveInstall" arch="ppc64le"> - <type image="iso" - publisher="Fedora Project" volid="Fedora_Linux" 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"/> + <preferences profiles="LiveInstall"> + <type image="iso" publisher="Fedora Project" volid="Fedora_Linux" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false"> + <bootloader name="grub2" grub_template="grub.cfg.iso-template" console="console" timeout="10"/> </type> </preferences> <packages type="iso" patternType="plusRecommended" profiles="LiveInstall"> diff --git a/grub-arm.cfg.iso-template b/grub-arm.cfg.iso-template deleted file mode 100644 index e24dd2d..0000000 --- a/grub-arm.cfg.iso-template +++ /dev/null @@ -1,37 +0,0 @@ -# Inspired by the config used for lorax-built live media - -set default=${default_boot} - -function load_video { - insmod efi_gop - insmod efi_uga - insmod video_bochs - insmod video_cirrus - insmod all_video -} -set basicgfx="nomodeset" - -load_video -set gfxpayload=keep -insmod gzio -insmod part_gpt -insmod ext2 - -terminal_input console -terminal_output ${terminal_output} - -set timeout=${boot_timeout} -set timeout_style=${boot_timeout_style} - -search ${search_params} - -menuentry "Start ${title}" --class fedora --class gnu-linux --class gnu --class os { - linux ($$root)${bootpath}/${kernel_file} ${boot_options} - 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} - initrd ($$root)${bootpath}/${initrd_file} - } -} diff --git a/grub-ppc.cfg.iso-template b/grub-ppc.cfg.iso-template deleted file mode 100644 index 3ed12bb..0000000 --- a/grub-ppc.cfg.iso-template +++ /dev/null @@ -1,26 +0,0 @@ -# Inspired by the config used for lorax-built live media - -set default=${default_boot} - -insmod gzio -insmod part_gpt -insmod ext2 - -terminal_input console -terminal_output ${terminal_output} - -set timeout=${boot_timeout} -set timeout_style=${boot_timeout_style} - -search ${search_params} - -menuentry "Start ${title}" --class fedora --class gnu-linux --class gnu --class os { - linux ($$root)${bootpath}/${kernel_file} ${boot_options} - 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} - initrd ($$root)${bootpath}/${initrd_file} - } -} diff --git a/grub-x86.cfg.iso-template b/grub.cfg.iso-template index ca3a1c1..ca3a1c1 100644 --- a/grub-x86.cfg.iso-template +++ b/grub.cfg.iso-template |