From: Michael Prokop <mika@grml.org>
Date: Fri, 8 May 2015 11:59:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'hartwork:one-more-umount-fix'
X-Git-Tag: v0.70~10
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=95ea844460649c6a3f711b75a60210d2eff44c30;hp=-c

Merge remote-tracking branch 'hartwork:one-more-umount-fix'

PR 82 on github

Conflicts:
	grml-debootstrap
---

95ea844460649c6a3f711b75a60210d2eff44c30
diff --combined grml-debootstrap
index 89c56f4,cf9d00b..07b769d
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@@ -225,7 -225,7 +225,7 @@@ cleanup() 
  
        # ugly, but make sure we really don't leave anything (/proc /proc and
        # /dev /dev are intended, trying to work around timing issues, see #657023)
 -      for ARG in /sys /proc /proc /dev /dev ; do
 +      for ARG in /sys /proc /proc /dev/pts /dev/pts /dev /dev ; do
          [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1
          umount "$MNTPOINT"/$ARG >/dev/null 2>&1
        done
@@@ -535,7 -535,6 +535,7 @@@ prompt_for_release(
              squeeze  Debian/6.0 \
              wheezy   Debian/7.0 \
              jessie   Debian/8.0 \
 +            stretch  Debian/9.0 \
              sid      Debian/unstable)"
    [ $? -eq 0 ] || bailout
  }
@@@ -839,7 -838,7 +839,7 @@@ f
  # 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
  # }}}
@@@ -1037,7 -1036,7 +1037,7 @@@ prepare_vm() 
      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
@@@ -1097,7 -1096,6 +1097,7 @@@ finalize_vm() 
    mount -t proc none "${MNTPOINT}"/proc
    mount -t sysfs none "${MNTPOINT}"/sys
    mount --bind /dev "${MNTPOINT}"/dev
 +  mount --bind /dev/pts "${MNTPOINT}"/dev/pts
  
    mkdir -p "${MNTPOINT}/boot/grub"
    if ! [ -d "${MNTPOINT}"/usr/lib/grub/i386-pc/ ] ; then
@@@ -1132,8 -1130,7 +1132,8 @@@
  
    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
  }
@@@ -1397,13 -1394,11 +1397,13 @@@ chrootscript() 
    else
      einfo "Executing chroot-script now"
      mount --bind /dev "$MNTPOINT"/dev
 +    mount --bind /dev/pts "$MNTPOINT"/dev/pts
      if [ "$DEBUG" = "true" ] ; then
        chroot "$MNTPOINT" /bin/sh -x /bin/chroot-script ; RC=$?
      else
        chroot "$MNTPOINT" /bin/chroot-script ; RC=$?
      fi
 +    try_umount 3 "$MNTPOINT"/dev/pts
      try_umount 3 "$MNTPOINT"/dev
      eend $RC
    fi