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

PR 82 on github

Conflicts:
	grml-debootstrap

diff --git a/config b/config
index 2da5109..6d682aa 100644 (file)
--- a/config
+++ b/config
@@ -68,9 +68,9 @@
 # BACKPORTREPOS='yes'
 
 # Debian release that should be installed.
-# Supported values: lenny, squeeze, wheezy, sid
-# Default: 'wheezy'
-# RELEASE='wheezy'
+# Supported values: lenny, squeeze, wheezy, jessie, stretch, sid
+# Default: 'jessie'
+# RELEASE='jessie'
 
 # Define components that should be used within sources.list.
 # Default: 'main contrib non-free'

diff --git a/grml-debootstrap b/grml-debootstrap
index cf9d00b..07b769d 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -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,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
 }
@@ -838,7 +839,7 @@ fi
 # 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
 # }}}
@@ -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
@@ -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
@@ -1130,6 +1132,7 @@ finalize_vm() {
 
   umount "${MNTPOINT}"/proc
   umount "${MNTPOINT}"/sys
+  umount "${MNTPOINT}"/dev/pts
   try_umount 3 "${MNTPOINT}"/dev
   umount "${MNTPOINT}"
   kpartx -d "${ORIG_TARGET}" >/dev/null
@@ -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

diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index c4669e8..63ad455 100644 (file)
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -175,7 +175,7 @@ Options and environment variables
 *-r*, *--release* _releasename_::
 
     Specify release of new Debian system. Supported releases names: lenny,
-    squeeze, wheezy, jessie (note: requires a recent version of debootstrap)
+    squeeze, wheezy, jessie, stretch (note: requires a recent version of debootstrap)
     and sid. Corresponding with configuration variable RELEASE.
 
 *--pre-scripts* _directory_::
@@ -337,7 +337,7 @@ Where do you want to install grub to? Usage example: grub=/dev/sda
   release=...
 
 Specify release of new Debian system. Defaults to Debian jessie. Supported
-relases: lenny, squeeze, wheezy, jessie and sid. Usage example: release=sid
+releases: lenny, squeeze, wheezy, jessie, stretch and sid. Usage example: release=sid
 
   mirror=...
 

diff --git a/releasetable.txt b/releasetable.txt
index 7960030..5c3dc53 100644 (file)
--- a/releasetable.txt
+++ b/releasetable.txt
@@ -6,5 +6,6 @@
 |squeeze  |works
 |wheezy   |works
 |jessie   |works
+|stretch  |works
 |sid      |works[2]
 |======================