# make sure we don't leave any mounts - FAI doesn't remove them always
umount $CHROOT_OUTPUT/proc/sys/fs/binfmt_misc 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
+ umount $CHROOT_OUTPUT/run/udev 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/run 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/sys 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true
sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/g" "${file}"
sed -i "s/%SHORT_NAME%/$SHORT_NAME/g" "${file}"
sed -i "s/%VERSION%/$VERSION/g" "${file}"
+ if [ -n "${BOOT_FILE}" ] ; then
+ sed -i "s;%BOOT_FILE%;$BOOT_FILE;g" "${file}"
+ fi
[ -n "$DEFAULT_BOOTOPTIONS" ] && sed -i "s; boot=live; boot=live $DEFAULT_BOOTOPTIONS;" "${file}"
[ -n "$HOSTNAME" ] || HOSTNAME='grml'
[ -n "$HYBRID_METHOD" ] || HYBRID_METHOD='isohybrid'
[ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks'
-[ -n "$SECURE_BOOT" ] || SECURE_BOOT='ubuntu'
+[ -n "$SECURE_BOOT" ] || SECURE_BOOT='disable'
[ -n "$SQUASHFS_EXCLUDES_FILE" ] || SQUASHFS_EXCLUDES_FILE="${GRML_FAI_CONFIG}/config/grml/squashfs-excludes"
[ -n "$SUITE" ] || SUITE='testing'
[ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
fi
if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then
- FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH"
+ FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH --no-merged-usr"
fi
# create backup of old (not yet automatically generated) config file
eend $?
fi
+ # every recent Grml ISO ships a /conf/bootid.txt, though GRUB might find
+ # the /conf/bootid.txt of a different (Grml) ISO than the one that's
+ # supposed to be running, so within scripts/GRMLBASE/45-grub-images
+ # we generate a random filename, stored inside /boot/grub/bootfile.txt,
+ # which we place on the resulting ISO here
+ if [ -r "${CHROOT_OUTPUT}"/boot/grub/bootfile.txt ] ; then
+ mkdir -p "${BUILD_OUTPUT}"/conf
+ rm -f "${BUILD_OUTPUT}"/conf/bootfile* # ensure we don't leave any old(er) files behind
+
+ einfo "Generating "${BUILD_OUTPUT}"/conf/bootfile* files"
+ log "Generating "${BUILD_OUTPUT}"/conf/bootfile* files"
+
+ BOOT_FILE="/conf/bootfile_$(cat "${CHROOT_OUTPUT}"/boot/grub/bootfile.txt)"
+ echo "# This file is relevant for GRUB boot with the Grml ISO." > "${BUILD_OUTPUT}/${BOOT_FILE}"
+ # save information about the random filename inside /conf/bootfile.txt
+ echo "${BOOT_FILE}" > "${BUILD_OUTPUT}"/conf/bootfile.txt
+ eend $?
+ fi
+
grub_setup
# EFI boot files