From: Michael Prokop <mika@grml.org>
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

Merge remote-tracking branch 'remotes/origin/pr/113'
---

2cba71c7ac06006c75c1f2157f529d2efd89ea42
diff --cc grml-debootstrap
index 1a3cda5,4670144..ab7c577
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@@ -1517,13 -1519,18 +1522,23 @@@ f
    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,
 +  # see Debian Bug #891077 and Github-PR grml/grml-debootstrap#112
 +  if dmsetup ls | grep -q "^${LOOP_PART} "; then
 +    kpartx -d "/dev/${LOOP_DISK}" >/dev/null
 +  fi
  }
  # }}}