Try to get rid of any hanging $CHROOT_OUTPUT/dev[/pts] mountpoints

diff --git a/debian/changelog b/debian/changelog
index e5f7306..09e2252 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ grml-live (0.9.5) unstable; urgency=low
     because we have to skip FAI's updatebase task and lack /proc therefore.
     New packages that are being installed and want to start any daemons
     might fail, let's try to do our best to avoid that.
+  * Try to get rid of any hanging $CHROOT_OUTPUT/dev[/pts] mountpoints.
 
- -- Michael Prokop <mika@grml.org>  Thu, 16 Oct 2008 01:03:24 +0200
+ -- Michael Prokop <mika@grml.org>  Thu, 16 Oct 2008 11:22:58 +0200
 
 grml-live (0.9.4) unstable; urgency=low
 

diff --git a/grml-live b/grml-live
index d67ad71..47ee4ff 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -436,8 +436,12 @@ else
       rm -rf "$CHROOT_OUTPUT"/var/log/fai/*
    fi
 
+   # make sure we don't leave any mounts - FAI doesn't remove them always
    umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/sys  2>/dev/null || /bin/true
+   umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true
+   umount $CHROOT_OUTPUT/dev 2>/dev/null || /bin/true
+
    [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
 
    # notice: 'fai dirinstall' does not seem to exit appropriate, so: