syslinux: fixed for using BOOTLOADER not equal syslinux

Do not create syslinux.cfg if EFI_BOOTLOADER is set to not equal grub-efi.
This commit is contained in:
Anton Midyukov 2020-01-06 23:26:52 +07:00
parent 216da2366c
commit 00283166b7
4 changed files with 12 additions and 8 deletions

View File

@ -5,6 +5,8 @@
cd "$WORKDIR"
[ -d "syslinux" ] || exit 0
# apply size census while looking for potential squashfs images
find -maxdepth 1 -type f -size +1M \
| sed 's,^\./,,' \

View File

@ -5,6 +5,8 @@
cd "$WORKDIR"
[ -d "syslinux" ] || exit 0
grep -qs "@rescue_hash@" syslinux/*.cfg || exit 0
find -maxdepth 1 -type f -name rescue \

View File

@ -5,16 +5,16 @@
MODDIR="/usr/lib/syslinux"
CFG="$GLOBAL_BOOTLOADER.cfg"
mkdir -p "$WORKDIR/syslinux"
cd "$WORKDIR/syslinux"
# validate just in case (see also stage1 Makefile)
case "$GLOBAL_BOOTLOADER" in
isolinux|syslinux) ;;
*) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2;
exit 1;;
*) echo "Warning: GLOBAL_BOOTLOADER not supported: \`$GLOBAL_BOOTLOADER'" >&2;
rm -fr "$WORKDIR/syslinux"
exit 0;;
esac
cd "$WORKDIR/syslinux"
# copy extra files, if any
SYSLINUX_FILES="$(cat .in/syslinux.list)"
if [ -n "${SYSLINUX_FILES% }" ]; then

View File

@ -1,5 +1,7 @@
#!/bin/sh
[ -d "$WORKDIR/syslinux" ] || exit 0
gfxboot_datadir=/usr/share/gfxboot
if [ ! -d "$gfxboot_datadir" ]; then
@ -15,9 +17,7 @@ if [ ! -f "$bootlogo" ]; then
exit 0
fi
cd "$WORKDIR"
mkdir -p syslinux
cd syslinux
cd "$WORKDIR/syslinux"
# unpack
cpio -iduV <"$bootlogo"