Commit 00283166 authored by Anton Midyukov's avatar Anton Midyukov

syslinux: fixed for using BOOTLOADER not equal syslinux

Do not create syslinux.cfg if EFI_BOOTLOADER is set to not equal grub-efi.
parent 216da236
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
cd "$WORKDIR" cd "$WORKDIR"
[ -d "syslinux" ] || exit 0
# apply size census while looking for potential squashfs images # apply size census while looking for potential squashfs images
find -maxdepth 1 -type f -size +1M \ find -maxdepth 1 -type f -size +1M \
| sed 's,^\./,,' \ | sed 's,^\./,,' \
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
cd "$WORKDIR" cd "$WORKDIR"
[ -d "syslinux" ] || exit 0
grep -qs "@rescue_hash@" syslinux/*.cfg || exit 0 grep -qs "@rescue_hash@" syslinux/*.cfg || exit 0
find -maxdepth 1 -type f -name rescue \ find -maxdepth 1 -type f -name rescue \
......
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
MODDIR="/usr/lib/syslinux" MODDIR="/usr/lib/syslinux"
CFG="$GLOBAL_BOOTLOADER.cfg" CFG="$GLOBAL_BOOTLOADER.cfg"
mkdir -p "$WORKDIR/syslinux"
cd "$WORKDIR/syslinux"
# validate just in case (see also stage1 Makefile) # validate just in case (see also stage1 Makefile)
case "$GLOBAL_BOOTLOADER" in case "$GLOBAL_BOOTLOADER" in
isolinux|syslinux) ;; isolinux|syslinux) ;;
*) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2; *) echo "Warning: GLOBAL_BOOTLOADER not supported: \`$GLOBAL_BOOTLOADER'" >&2;
exit 1;; rm -fr "$WORKDIR/syslinux"
exit 0;;
esac esac
cd "$WORKDIR/syslinux"
# copy extra files, if any # copy extra files, if any
SYSLINUX_FILES="$(cat .in/syslinux.list)" SYSLINUX_FILES="$(cat .in/syslinux.list)"
if [ -n "${SYSLINUX_FILES% }" ]; then if [ -n "${SYSLINUX_FILES% }" ]; then
......
#!/bin/sh #!/bin/sh
[ -d "$WORKDIR/syslinux" ] || exit 0
gfxboot_datadir=/usr/share/gfxboot gfxboot_datadir=/usr/share/gfxboot
if [ ! -d "$gfxboot_datadir" ]; then if [ ! -d "$gfxboot_datadir" ]; then
...@@ -15,9 +17,7 @@ if [ ! -f "$bootlogo" ]; then ...@@ -15,9 +17,7 @@ if [ ! -f "$bootlogo" ]; then
exit 0 exit 0
fi fi
cd "$WORKDIR" cd "$WORKDIR/syslinux"
mkdir -p syslinux
cd syslinux
# unpack # unpack
cpio -iduV <"$bootlogo" cpio -iduV <"$bootlogo"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment