# make sure we have what we need {{{
if [ -n "$VIRTUAL" ] ; then
- check4progs grub-mkimage kpartx mksh parted qemu-img || bailout 1
+ check4progs kpartx mksh parted qemu-img || bailout 1
fi
# }}}
squeeze Debian/6.0 \
wheezy Debian/7.0 \
jessie Debian/8.0 \
+ stretch Debian/9.0 \
sid Debian/unstable)"
[ $? -eq 0 ] || bailout
}
# Support for generic release codenames is unavailable. {{{
if [ "$RELEASE" = "stable" ] || [ "$RELEASE" = "testing" ] ; then
eerror "Generic release codenames (stable, testing) are unsupported. \
-Please use specific codenames such as lenny, squeeze, wheezy or jessie." ; eend 1
+Please use specific codenames such as lenny, squeeze, wheezy, jessie or stretch." ; eend 1
bailout 1
fi
# }}}
einfo "Adjusting disk signature to a fixed (non-random) value"
MBRTMPFILE=$(mktemp)
dd if="${TARGET}" of="${MBRTMPFILE}" bs=512 count=1
- echo -en "\x41\x41\x41\x41\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1
+ echo -en "\x41\x41\x41\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1
dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc
eend $?
fi
bailout 1
fi
- einfo "Installing Grub as bootloader."
mount -t proc none "${MNTPOINT}"/proc
mount -t sysfs none "${MNTPOINT}"/sys
mount --bind /dev "${MNTPOINT}"/dev
mount --bind /dev/pts "${MNTPOINT}"/dev/pts
+# Has chroot-script installed GRUB to MBR using grub-install (successfully), already?
+# chroot-script skips installation for unset ${GRUB}
+if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v | fgrep -q GRUB; then
+ einfo "Installing Grub as bootloader."
mkdir -p "${MNTPOINT}/boot/grub"
if ! [ -d "${MNTPOINT}"/usr/lib/grub/i386-pc/ ] ; then
eerror "Error: grub not installed inside Virtual Machine. Can not install bootloader." ; eend 1
chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos ext2
dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=4
rm -f "${MNTPOINT}/tmp/core.img"
+fi
einfo "Updating grub configuration file."
if [ -n "$BOOT_APPEND" ] ; then
umount "${MNTPOINT}"/proc
umount "${MNTPOINT}"/sys
umount "${MNTPOINT}"/dev/pts
- umount "${MNTPOINT}"/dev
+ try_umount 3 "${MNTPOINT}"/dev
umount "${MNTPOINT}"
kpartx -d "${ORIG_TARGET}" >/dev/null
}