almalinux
/
lorax
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Update syslinux 6.02 support for noarch change 

syslinux-nonlinux is now noarch, update the template.
Add loading of the other syslinux modules to the live x86.tmpl
This commit is contained in:
Brian C. Lane 2014-04-15 13:17:36 -07:00
parent 17eee3ab1a
commit 127e6c7df1
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lorax.spec
View File

@ -47,7 +47,7 @@ Requires: hfsplus-tools
%endif %endif
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
Requires: syslinux >= 4.02-5 Requires: syslinux >= 6.02-4
%endif %endif
%ifarch ppc ppc64 %ifarch ppc ppc64

3
share/live/x86.tmpl
View File

@ -16,6 +16,9 @@ treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
mkdir ${BOOTDIR} mkdir ${BOOTDIR}
install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR} install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
install ${SYSLINUXDIR}/vesamenu.c32 ${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}/isolinux.cfg ${BOOTDIR}
install ${configdir}/boot.msg ${BOOTDIR} install ${configdir}/boot.msg ${BOOTDIR}
install ${configdir}/grub.conf ${BOOTDIR} install ${configdir}/grub.conf ${BOOTDIR}

2
share/runtime-install.tmpl
View File

@ -32,7 +32,7 @@ installpkg grubby
installpkg efibootmgr grub2-efi shim shim-unsigned installpkg efibootmgr grub2-efi shim shim-unsigned
%endif %endif
%if basearch in ("i386", "x86_64"): %if basearch in ("i386", "x86_64"):
installpkg grub2 grub2-tools biosdevname memtest86+ syslinux syslinux-nonlinux.i686 installpkg grub2 grub2-tools biosdevname memtest86+ syslinux syslinux-nonlinux
%endif %endif
%if basearch in ("ppc", "ppc64", "ppc64le"): %if basearch in ("ppc", "ppc64", "ppc64le"):
installpkg grub2 grub2-tools fbset hfsutils kernel-bootwrapper ppc64-utils installpkg grub2 grub2-tools fbset hfsutils kernel-bootwrapper ppc64-utils