done
echo -ne "\n"
}
+
+# Copy addonfile $1 from the TEMPLATE_DIRECTORY/compat (if exists),
+# or from $2 (the system path), or warn about the missing file.
+# This is because:
+# * On unstable, we Recommend the Debian packages containing
+# these files. The user can override them by putting his
+# "better" version into TEMPLATE_DIRECTORY/compat.
+# * On stable, the Debian packages are probably not available,
+# or outdated, so we look in TEMPLATE_DIRECTORY/compat first, where
+# our grml-live-compat package installs current file versions.
+copy_addon_file() {
+ if [ ! -d "${BUILD_OUTPUT}/boot/$3/" ]; then
+ mkdir -p "${BUILD_OUTPUT}/boot/$3"
+ fi
+ if [ -e "${TEMPLATE_DIRECTORY}/compat/$3/$1" ]; then
+ cp "${TEMPLATE_DIRECTORY}/compat/$3/$1" "${BUILD_OUTPUT}/boot/$3/"
+ return $?
+ fi
+ if [ -e "$2/$1" ]; then
+ log "Copying $1 from system"
+ cp "$2/$1" "${BUILD_OUTPUT}/boot/$3/"
+ return $?
+ fi
+
+ msg="Missing addon file: \"$1\""
+ ewarn "$msg" ; eend 1
+ log "copy_addon_file: $msg"
+}
# }}}
# read local (non-packaged) configuration {{{
[ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux
[ -d "$BUILD_OUTPUT"/boot/"${SHORT_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${SHORT_NAME}"
- if [ -z "$NO_ADDONS" ] ; then
- [ -d "$BUILD_OUTPUT"/boot/addons ] || mkdir -p "$BUILD_OUTPUT"/boot/addons
- if [ -r "$TEMPLATE_DIRECTORY"/boot/addons/memtest ] ; then
- log "Installing $TEMPLATE_DIRECTORY/boot/addons/memtest"
- cp "$TEMPLATE_DIRECTORY"/boot/addons/memtest "$BUILD_OUTPUT"/boot/addons/memtest
- elif [ -r /boot/memtest86+.bin ] ; then
- log "Installing /boot/memtest86+.bin"
- cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
- else
- ewarn "No memtest binary found (either install package grml-live-addons or memtest86+), skipping."
- log "No memtest binary found (either install package grml-live-addons or memtest86+), skipping."
- eend 0
- fi
- fi
-
# if we don't have an initrd we a) can't boot and b) there was an error
# during build, so check for the file:
INITRD="$(ls $CHROOT_OUTPUT/boot/initrd* 2>/dev/null| grep -v '.bak$' | sort -r | head -1)"
bailout 8
fi
+ # copy _required_ isolinux files
+ for file in ifcpu64.c32 isolinux.bin vesamenu.c32; do
+ copy_addon_file "${file}" /usr/lib/syslinux isolinux
+ done
+
# *always* copy files to output directory so the variables
- # get adjusted according to the build
+ # get adjusted according to the build.
cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
if [ -n "$NO_ADDONS" ] ; then
log "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)"
ewarn "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)" ; eend 0
else
+ # copy addons from system packages or grml-live-compat
+ copy_addon_file ipxe.lkrn /usr/lib/ipxe addons
+ copy_addon_file pci.ids /usr/share/misc addons
+ copy_addon_file memtest86+.bin /boot addons
+ 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" \
+ "${BUILD_OUTPUT}/boot/addons/memtest"
+
# copy only files so we can handle bsd4grml on its own
for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/
if [ -d "$TEMPLATE_DIRECTORY"/boot/addons/bsd4grml ] ; then
cp -a ${TEMPLATE_DIRECTORY}/boot/addons/bsd4grml "$BUILD_OUTPUT"/boot/addons/
else
- log "bsd4grml addon not found, skipping therefore."
- ewarn "bsd4grml addon not found, skipping therefore." ; eend 0
+ log "Missing addon file: bsd4grml"
+ ewarn "Missing addon file: bsd4grml" ; eend 0
fi
fi
fi # no "$TEMPLATE_DIRECTORY"/boot/addons
fi # NO_ADDONS
- if ! [ -d ${TEMPLATE_DIRECTORY}/boot/grub ] ; then
- log "grub templates do not exist, skipping therefore."
- ewarn "grub templates do not exist, skipping therefore." ; eend 0
- else
- if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
- cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/
- fi
+ if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
+ mkdir -p "${BUILD_OUTPUT}/boot/grub"
+ fi
+ cp ${TEMPLATE_DIRECTORY}/boot/grub/* "$BUILD_OUTPUT"/boot/grub/
- # make sure we have recent template files available, otherwise updating
- # the strings like $GRML_NAME and $VERSION might be out of date
- cp ${TEMPLATE_DIRECTORY}/boot/grub/* "$BUILD_OUTPUT"/boot/grub/
+ if [ -e ${TEMPLATE_DIRECTORY}/compat/grub/linux.mod ]; then
+ cp "${TEMPLATE_DIRECTORY}"/compat/grub/* "${BUILD_OUTPUT}"/boot/grub/
+ else
+ 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 "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
+ 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/
+ grub-mkimage -d /usr/lib/grub/*-pc -o \
+ "${BUILD_OUTPUT}/boot/grub/core.img" biosdisk iso9660 --format=i386-pc
+ fi
fi
if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then
fi
fi
- # jump back to grub from bsd4grml (/boot/grub/stage2):
- GRUB_LEGACY=stage2
-
if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then
- if [ -e "$BUILD_OUTPUT"/boot/grub/core.img ]; then
- GRUB_VERSION=2
- else
- GRUB_VERSION=1
- fi
-
- for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \
- "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg \
- "$BUILD_OUTPUT"/boot/isolinux/*.cfg \
- "$BUILD_OUTPUT"/boot/grub/grub.cfg \
- "$BUILD_OUTPUT"/boot/grub/menu.lst ; do
- if [ -e "$file" ] ; then
- sed -i -e "s!%GRUB_VERSION%!$GRUB_VERSION!g" \
- -e "s!%GRUB_LEGACY%!$GRUB_LEGACY!g" "$file"
- fi
- done
-
sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6
fi
- if [ -e "$BUILD_OUTPUT"/boot/grub/$GRUB_LEGACY ]; then
- sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/menu.lst
- sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/grub.cfg
- elif [ -e "$BUILD_OUTPUT"/boot/grub/menu.lst -a -e "$BUILD_OUTPUT"/boot/grub/grub.cfg ] ; then
- sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/menu.lst
- sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/grub.cfg
- fi
-
DPKG_LIST="/var/log/fai/$HOSTNAME/last/dpkg.list" # the dpkg --list output of the chroot
if ! [ -r "$DPKG_LIST" ] ; then
ewarn "$DPKG_LIST could not be read, ignoring to store package information on ISO therefore."
if [ "$BOOT_METHOD" = "isolinux" ] ; then
BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
-elif [ "$BOOT_METHOD" = "grub" ] ; then
- BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/grub/stage2"
elif [ "$BOOT_METHOD" = "grub2" ] ; then
BOOT_ARGS="-no-emul-boot -boot-load-size 4 -b boot/grub/toriboot.bin"
fi
projects / grml-live.git / blobdiff