# clean exit {{{
bailout() {
[ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+ rm -f /var/run/fai/fai_softupdate_is_running /var/run/fai/FAI_INSTALLATION_IN_PROGRESS
[ -n "$1" ] && EXIT="$1" || EXIT="1"
[ -n "$2" ] && eerror "$2">&2
log "------------------------------------------------------------------------------"
bailout 10
fi
- cp "$CHROOT_OUTPUT"/boot/vmlinuz* "$BUILD_OUTPUT"/boot/isolinux/linux26
+ KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* | sort -r | head -1)"
+ cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/isolinux/linux26
cp /usr/lib/syslinux/chain.c32 "$BUILD_OUTPUT"/boot/isolinux/
cp /usr/lib/syslinux/isolinux.bin "$BUILD_OUTPUT"/boot/isolinux/
cp /usr/lib/syslinux/memdisk "$BUILD_OUTPUT"/boot/isolinux/
bailout 8
fi
- cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
- cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
- if ! [ -d "${TEMPLATE_DIRECTORY}/boot/grub" ] ; then
- cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/
+ cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
+ cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
+
+ if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
+ cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/
fi
if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then
( cd "$BUILD_OUTPUT"/windows
for file in pageant plink pscp psftp putty puttygen ; do
wget -O ${file}.exe ${WINDOWS_BINARIES}/${file}.exe
+ md5sum ${WINDOWS_BINARIES}/${file}.exe > ${WINDOWS_BINARIES}/${file}.exe.md5
done )
fi
fi
log "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'"
ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ; eend 0
else
- mkdir "$BUILD_OUTPUT"/live
+ [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live
mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend
log "Finished execution of stage 'squashfs' [$(date)]"
einfo "Finished execution of stage 'squashfs'" ; eend 0