return $?
fi
if [ -e "$2/$1" ]; then
- echo "Copying $1 from system"
+ log "Copying $1 from system"
cp "$2/$1" "${BUILD_OUTPUT}/boot/$3/"
return $?
fi
for file in memdisk chain.c32 hdt.c32 menu.c32; do
copy_addon_file "${file}" /usr/lib/syslinux addons
done
- # make memtest filename FAT16/8.3 compatible
- mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \
+
+ # make memtest filename FAT16/8.3 compatible
+ mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \
"${BUILD_OUTPUT}/boot/addons/memtest"
# copy only files so we can handle bsd4grml on its own
if [ -e ${TEMPLATE_DIRECTORY}/compat/grub/linux.mod ]; then
cp "${TEMPLATE_DIRECTORY}"/compat/grub/* "${BUILD_OUTPUT}"/boot/grub/
else
- if ! [ -x /usr/bin/grub-mkimage ] ; then
+ if ! which "grub-mkimage" >/dev/null 2>&1 ; then
log "grub-mkimage not found, skipping Grub step therefore." ; eend 0
ewarn "grub-mkimage not found, skipping Grub step therefore."
- ewarn "Either install grub-common >= 1.98+20100804-14 or grub-pc." ; eend 0
+ ewarn "Please install grub-pc-bin or grub-common >= 1.98+20100804-14." ; eend 0
+ elif ! grub-mkimage --help | grep -q -- --format ; then
+ log "grub-mkimage does not support --format=i386-pc, skipping Grub step therefore." ; eend 0
+ ewarn "grub-mkimage does not support --format=i386-pc, skipping Grub step therefore."
+ ewarn "Please install grub-common >= 1.98+20100804-14 or grub-pc-bin." ; eend 0
else
- # copy system grub files if grml-live-compat is not
- # installed.
+ # copy system grub files if grml-live-compat is not installed
cp -a /usr/lib/grub/*-pc/*.mod "${BUILD_OUTPUT}"/boot/grub/
cp -a /usr/lib/grub/*-pc/*.o "${BUILD_OUTPUT}"/boot/grub/
cp -a /usr/lib/grub/*-pc/*.lst "${BUILD_OUTPUT}"/boot/grub/
cp -a /usr/share/grub/ascii.pf2 "${BUILD_OUTPUT}"/boot/grub/
- /usr/bin/grub-mkimage -d /usr/lib/grub/*-pc -o \
+ grub-mkimage -d /usr/lib/grub/*-pc -o \
"${BUILD_OUTPUT}/boot/grub/core.img" biosdisk iso9660 --format=i386-pc
fi
fi