Unmount /proc and /dev/pts just before unmounting the disk image (Closes: #588783)

bin/xen-create-image

@@ -3732,12 +3732,6 @@ sub runCustomisationHooks
     } else {
         unlink "$MOUNT_POINT/etc/resolv.conf";
     }
-
-    #
-    #  Unmount /proc and /dev/pts in the guest install.
-    #
-    runCommand("umount $MOUNT_POINT/proc");
-    runCommand("umount $MOUNT_POINT/dev/pts");
 }
 
 
@@ -4266,6 +4260,12 @@ sub unMountImage
 {
     my ($point) = (@_);
 
+    #
+    #  First we unmount /proc and /dev/pts in the guest install.
+    #
+    runCommand("umount $MOUNT_POINT/proc");
+    #runCommand("umount $MOUNT_POINT/dev/pts");
+
     #
     #  Open /proc/mount and get a list of currently mounted paths
     # which begin with our mount point.

debian/changelog

@@ -7,6 +7,8 @@ xen-tools (4.2+dev-1) UNRELEASED; urgency=low
       to Guillaume Pernot! (Closes: #611397) Also changes default Sarge
       amd64 mirror to http://archive.debian.org/debian-amd64/.
     - Allows --ip=auto again (Closes: #611407)
+    - Unmounts /proc and /dev/pts of the freshly installed DomU just
+      before unmounting the disk image. (Closes: #588783)
 
  -- Axel Beckert <abe@debian.org>  Tue, 08 Mar 2011 23:24:06 +0100