From 68569c4daa35e6dd19216a40e3b82dcbfc5a426a Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont.jones@canonical.com>
Date: Fri, 7 Jan 2005 07:03:26 +0000
Subject: [PATCH] depend python, cleanup unmounting loopback

---
 debian/control   | 4 ++--
 debian/livecd.sh | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f8f06a2c..d77f3d4d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: livecd-rootfs
 Section: devel
 Priority: optional
-Build-Depends: sudo, debootstrap, rsync, cloop-utils, debhelper
+Build-Depends: sudo, debootstrap, rsync, cloop-utils, debhelper, python-minimal|python
 Maintainer: LaMont Jones <lamont@canonical.com>
 Standards-Version: 3.6.1.0
 
 Package: livecd-rootfs
 Architecture: any
-Depends: sudo, debootstrap, rsync, cloop-utils
+Depends: sudo, debootstrap, rsync, cloop-utils, python-minimal|python
 Description: Construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem
  on the livecd.
diff --git a/debian/livecd.sh b/debian/livecd.sh
index 0443e82e..9610f9da 100755
--- a/debian/livecd.sh
+++ b/debian/livecd.sh
@@ -27,7 +27,7 @@ esac
 
 ROOT=$(pwd)/chroot-livecd/
 IMG=livecd.fsimg
-MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev $(pwd)/$IMG ${ROOT}proc"
+MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc"
 
 rm -rf ${ROOT}
 
@@ -121,6 +121,7 @@ mke2fs $INUM -Osparse_super -F $IMG
 DEV=$(losetup -f);
 losetup $DEV $IMG
 mkdir -p livecd.mnt
+MOUNTS="$MOUNTS $(pwd)/livecd.mnt"
 mount $DEV livecd.mnt
 rsync -a ${ROOT}/ livecd.mnt