From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 16 Aug 2006 15:03:30 +0000 (+0000)
Subject: - fix bind mount of fedora mirror during bootstrap build
X-Git-Tag: planetlab-4_0-rc1~105
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=39cd186574e5aff00eccb8f2698ffd89a984a0f8;p=myplc.git

- fix bind mount of fedora mirror during bootstrap build
---

diff --git a/build.sh b/build.sh
index 508d07a..32e90b1 100755
--- a/build.sh
+++ b/build.sh
@@ -34,14 +34,14 @@ if [ "$PLC_DEVEL_BOOTSTRAP" = "true" ] ; then
     # If we used a local mirror, bind mount it into the chroot so that
     # we can use it again.
     if [ "${PLC_DEVEL_FEDORA_URL:0:7}" = "file://" ] ; then
-	mkdir -p devel/data/fedora
-	mount -o bind,ro ${PLC_DEVEL_FEDORA_URL#file://} devel/data/fedora
+	mkdir -p devel/root/data/fedora
+	mount -o bind,ro ${PLC_DEVEL_FEDORA_URL#file://} devel/root/data/fedora
     fi
 
     # Clean up before exiting if anything goes wrong
-    trap "umount $PWD/devel/root/data;
-          umount $PWD/devel/root/proc;
-          umount $PWD/devel/root/usr/share/mirrors/fedora" ERR INT
+    trap "umount $PWD/devel/root/data/fedora;
+          umount $PWD/devel/root/data;
+          umount $PWD/devel/root/proc" ERR INT
 
     # Build myplc inside myplc-devel. Make sure PLC_DEVEL_BOOTSTRAP is
     # false to avoid infinite recursion.