From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 16 Aug 2006 01:27:16 +0000 (+0000)
Subject: change PLC_DEVEL_FEDORA_URL to default specified in documentation
X-Git-Tag: planetlab-4_0-rc1~106
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6c3d7958b498d51331a8c3ec6e640dc3abed6dc1;p=myplc.git

change PLC_DEVEL_FEDORA_URL to default specified in documentation
---

diff --git a/build.functions b/build.functions
index faf4b84..68e1090 100644
--- a/build.functions
+++ b/build.functions
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: build.functions,v 1.2 2006/07/24 19:32:23 mlhuang Exp $
+# $Id: build.functions,v 1.3 2006/08/09 21:38:05 mlhuang Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -29,7 +29,7 @@ PLC_DEVEL_FEDORA_RELEASE=4
 PLC_DEVEL_FEDORA_ARCH=i386
 
 # Fedora Core mirror from which to install filesystems
-PLC_DEVEL_FEDORA_URL=file:///usr/share/mirrors/fedora
+PLC_DEVEL_FEDORA_URL=file:///data/fedora
 
 # Build myplc inside myplc-devel
 PLC_DEVEL_BOOTSTRAP=true
diff --git a/build.sh b/build.sh
index e52cb34..508d07a 100755
--- a/build.sh
+++ b/build.sh
@@ -14,7 +14,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.28 2006/08/09 21:38:06 mlhuang Exp $
+# $Id$
 #
 
 . build.functions
@@ -34,8 +34,8 @@ 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/root/usr/share/mirrors/fedora
-	mount -o bind,ro ${PLC_DEVEL_FEDORA_URL#file://} devel/root/usr/share/mirrors/fedora
+	mkdir -p devel/data/fedora
+	mount -o bind,ro ${PLC_DEVEL_FEDORA_URL#file://} devel/data/fedora
     fi
 
     # Clean up before exiting if anything goes wrong
diff --git a/plc_devel_config.xml b/plc_devel_config.xml
index cb9e5b0..10f80aa 100644
--- a/plc_devel_config.xml
+++ b/plc_devel_config.xml
@@ -6,7 +6,7 @@ Default PLC build environment configuration file
 Mark Huang <mlhuang@cs.princeton.edu>
 Copyright (C) 2006 The Trustees of Princeton University
 
-$Id: plc_devel_config.xml,v 1.1 2006/07/17 21:31:31 mlhuang Exp $
+$Id: plc_devel_config.xml,v 1.2 2006/07/18 17:37:53 mlhuang Exp $
 -->
 
 <!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
@@ -37,7 +37,7 @@ $Id: plc_devel_config.xml,v 1.1 2006/07/17 21:31:31 mlhuang Exp $
 
 	<variable id="fedora_url" type="string">
 	  <name>Fedora Core Mirror URL</name>
-	  <value>file:///usr/share/mirrors/fedora</value>
+	  <value>file:///data/fedora</value>
 	  <description>Fedora Core mirror from which to install
 	  filesystems.</description>
 	</variable>