From 8bd3206eff65b310f68f1f148de33e54c3aa9c1b Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 9 Mar 2011 00:56:14 +0100 Subject: [PATCH] Unmount /proc and /dev/pts just before unmounting the disk image (Closes: #588783) --- bin/xen-create-image | 12 ++++++------ debian/changelog | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/xen-create-image b/bin/xen-create-image index b90db1a..57585bb 100755 --- a/bin/xen-create-image +++ b/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. diff --git a/debian/changelog b/debian/changelog index 4f782bc..6551aa5 100644 --- a/debian/changelog +++ b/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 Tue, 08 Mar 2011 23:24:06 +0100