diff --git a/80-rhel/live/live-install.tmpl b/80-rhel/live/live-install.tmpl index 3669e38..bfa1a1b 100644 --- a/80-rhel/live/live-install.tmpl +++ b/80-rhel/live/live-install.tmpl @@ -17,7 +17,7 @@ installpkg shim-x64 grub2-efi-x64-cdboot %endif %if basearch in ("i386", "x86_64"): - installpkg biosdevname memtest86+ syslinux + installpkg biosdevname memtest86+ installpkg grub2-tools grub2-tools-minimal grub2-tools-extra %endif %if basearch in ("ppc64le"): diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl index 473faab..75d9aa9 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl @@ -1,9 +1,7 @@ <%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel, extra_boot_args"/> <% configdir="tmp/config_files/x86" -SYSLINUXDIR="usr/share/syslinux" PXEBOOTDIR="images/pxeboot" -BOOTDIR="isolinux" KERNELDIR=PXEBOOTDIR LIVEDIR="LiveOS" LORAXDIR="usr/share/lorax/" @@ -29,25 +27,6 @@ mkdir ${LIVEDIR} install ${runtime_img} ${LIVEDIR}/squashfs.img treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img -## install bootloader and config files -mkdir ${BOOTDIR} -install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR} -install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR} -install ${SYSLINUXDIR}/ldlinux.c32 ${BOOTDIR} -install ${SYSLINUXDIR}/libcom32.c32 ${BOOTDIR} -install ${SYSLINUXDIR}/libutil.c32 ${BOOTDIR} -install ${configdir}/isolinux.cfg ${BOOTDIR} -install ${configdir}/boot.msg ${BOOTDIR} -install ${configdir}/grub.conf ${BOOTDIR} -install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png -install boot/memtest* ${BOOTDIR}/memtest - -## configure bootloader -replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg -replace @EXTRA@ '${extra_boot_args}' ${BOOTDIR}/isolinux.cfg - ## install kernels mkdir ${KERNELDIR} %for kernel in kernels: @@ -60,8 +39,6 @@ mkdir ${KERNELDIR} %endif %endfor -hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR} -hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %if basearch == 'x86_64': treeinfo images-xen kernel ${KERNELDIR}/vmlinuz treeinfo images-xen initrd ${KERNELDIR}/initrd.img @@ -84,7 +61,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %> %for img, hybrid in images: <% - efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot {1}".format(img, hybrid) + efiargs += " --efi-boot {0} {1}".format(img, hybrid) efigraft += " {0}={1}/{0}".format(img,outroot) %> treeinfo images-${basearch} ${img|basename} ${img} @@ -120,12 +97,8 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} ## make boot.iso runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \ - -isohybrid-mbr /usr/share/syslinux/isohdpfx.bin \ - -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \ - -boot-load-size 4 -boot-info-table -no-emul-boot \ ${efiargs} -R -J -V '${isolabel}' \ -graft-points \ - ${BOOTDIR}=${outroot}/${BOOTDIR} \ ${KERNELDIR}=${outroot}/${KERNELDIR} \ ${LIVEDIR}=${outroot}/${LIVEDIR} \ ${efigraft} ${filegraft} diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl index 6f3aef4..c0c0662 100644 --- a/80-rhel/runtime-install.tmpl +++ b/80-rhel/runtime-install.tmpl @@ -48,7 +48,7 @@ installpkg glibc-all-langpacks installpkg shim-x64 grub2-efi-x64-cdboot %endif %if basearch in ("i386", "x86_64"): - installpkg biosdevname memtest86+ syslinux + installpkg biosdevname memtest86+ installpkg grub2-tools grub2-tools-minimal grub2-tools-extra %endif %if basearch in ("ppc", "ppc64", "ppc64le"): diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl index 3d9d0a4..a4e1a4c 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl @@ -29,24 +29,6 @@ mkdir images install ${runtime_img} ${STAGE2IMG} treeinfo stage2 mainimage images/${runtime_base} -## install bootloader and config files -mkdir ${BOOTDIR} -install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR} -install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR} -install ${SYSLINUXDIR}/ldlinux.c32 ${BOOTDIR} -install ${SYSLINUXDIR}/libcom32.c32 ${BOOTDIR} -install ${SYSLINUXDIR}/libutil.c32 ${BOOTDIR} -install ${configdir}/isolinux.cfg ${BOOTDIR} -install ${configdir}/boot.msg ${BOOTDIR} -install ${configdir}/grub.conf ${BOOTDIR} -install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png -install boot/memtest* ${BOOTDIR}/memtest - -## configure bootloader -replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg - ## install kernels mkdir ${KERNELDIR} %for kernel in kernels: @@ -61,8 +43,6 @@ mkdir ${KERNELDIR} %endif %endfor -hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR} -hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %if basearch == 'x86_64': treeinfo images-xen kernel ${KERNELDIR}/vmlinuz treeinfo images-xen initrd ${KERNELDIR}/initrd.img @@ -85,7 +65,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %> %for img, hybrid in images: <% - efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot {1}".format(img, hybrid) + efiargs += " --efi-boot {0} {1}".format(img, hybrid) efigraft += " {0}={1}/{0}".format(img,outroot) %> treeinfo images-${basearch} ${img|basename} ${img} @@ -122,14 +102,10 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} ## make boot.iso runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \ - -isohybrid-mbr /usr/share/syslinux/isohdpfx.bin \ - -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \ - -boot-load-size 4 -boot-info-table -no-emul-boot \ ${efiargs} -R -J -V '${isolabel}' \ -graft-points \ .discinfo=${outroot}/.discinfo \ ${STAGE2IMG}=${outroot}/${STAGE2IMG} \ - ${BOOTDIR}=${outroot}/${BOOTDIR} \ ${KERNELDIR}=${outroot}/${KERNELDIR} \ ${efigraft} ${filegraft} treeinfo images-${basearch} boot.iso images/boot.iso