From: Michael Prokop Date: Wed, 14 Nov 2018 21:23:04 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/origin/pr/113' X-Git-Tag: v0.83~1 X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=2cba71c7ac06006c75c1f2157f529d2efd89ea42;hp=c570da404b5e378c1ccd85c44f0a2117c8ce76d5 Merge remote-tracking branch 'remotes/origin/pr/113' --- diff --git a/config b/config index 6638a44..ba57247 100644 --- a/config +++ b/config @@ -24,6 +24,10 @@ # TARGET='/mnt/grml' # install into directory /mnt/grml # Install the grub bootloader? +# Default: 'yes' +# Usage example: +# GRUB_INSTALL='no' # Do not install the grub bootloader. + # Specify the device where grub will be installed. # Note: grub can not be installed into a partition. # Default: no default. (Grub will not be installed.) diff --git a/grml-debootstrap b/grml-debootstrap index 1a3cda5..ab7c577 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -80,6 +80,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0' [ -n "$UPGRADE_SYSTEM" ] || UPGRADE_SYSTEM='yes' [ -n "$VMSIZE" ] || VMSIZE="2G" +[ -n "$GRUB_INSTALL" ] || GRUB_INSTALL='yes' # inside the chroot system locales might not be available, so use minimum: export LANG=C @@ -1444,11 +1445,15 @@ prepare_vm() { } # }}} -# make VM image bootable and unmount it {{{ -finalize_vm() { +# make VM image bootable {{{ +grub_install() { if [ -z "${VIRTUAL}" ] ; then return 0 fi + if [ "${GRUB_INSTALL}" != "yes" ] ; then + einfo "Not installing GRUB as requested via \$GRUB_INSTALL=$GRUB_INSTALL" + return 0 + fi if ! mount "${TARGET}" "${MNTPOINT}" ; then eerror "Error: Mounting ${TARGET} failed, can not continue." ; eend 1 @@ -1517,6 +1522,16 @@ fi umount "${MNTPOINT}"/sys umount "${MNTPOINT}"/dev/pts try_umount 3 "${MNTPOINT}"/dev + +} +# }}} + +# unmount VM image {{{ +umount_target() { + if [ -z "${VIRTUAL}" ] ; then + return 0 + fi + umount "${MNTPOINT}" kpartx -d "${ORIG_TARGET}" >/dev/null # Workaround for a bug in kpartx which doesn't clean up properly, @@ -1889,7 +1904,7 @@ remove_configs() { for i in format_efi_partition prepare_vm mkfs tunefs \ mount_target mountpoint_to_blockdevice debootstrap_system \ preparechroot execute_pre_scripts chrootscript execute_post_scripts \ - remove_configs umount_chroot finalize_vm fscktool ; do + remove_configs umount_chroot grub_install umount_target fscktool ; do if stage "${i}" ; then if "$i" ; then stage "${i}" 'done' && rm -f "${STAGES}/${i}"