X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=2897600813367c08c67d2460633857819d151d05;hb=1b52a554bc125105995bf2a53503c3d9337ad22f;hp=cf569a21c4eec803f15f03100636f5ebe2ed2c0b;hpb=2815cf34d2a319f868144b59aa5f1ab55acec54a;p=vserver-reference.git

diff --git a/vserver-reference.init b/vserver-reference.init
index cf569a2..2897600 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -2,15 +2,19 @@
 #
 # Builds VServer reference image. Requires the web and boot servers to
 # be up, which complicates bootstrap. Alternatively, we could require
-# the build server to host a local yum repository.
+# the build server to host a local yum repository. Already, it is
+# required to run the same major version of yum as the nodes.
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2005 The Trustees of Princeton University
 #
-# $Id: vserver-reference.init,v 1.12 2005/09/01 17:39:55 mlhuang Exp $
+# $Id: vserver-reference.init,v 1.16 2005/09/02 15:21:00 mlhuang Exp $
 #
 
-YUM_CONF="http://www.planet-lab.org/PlanetLabConf/v3-yum.conf"
+# Get the URL for the production /etc/yum.conf file. XXX When MAs
+# begin deploying their own boot servers and/or code, this will have
+# to change.
+YUM_CONF=http://boot.planet-lab.org/$(curl --silent --insecure --form node_id=0 --form file=/etc/yum.conf https://boot.planet-lab.org/db/plnodeconf/getsinglefile.php)
 
 # Make /vservers
 VROOT=$PWD/vservers/vserver-reference
@@ -89,9 +93,8 @@ yum -c $YUM_CONF --installroot=$VROOT -y groupinstall VServer
 # completely new PlanetLab package must be installed in the reference
 # image. To work around this limitation, introduce the new package in
 # one release, then include it in the VServer yumgroup in the next.
-FRESHEN=$RPM_BUILD_DIR/../RPMS/*/*.rpm
-if [ -n "$FRESHEN" ] ; then
-    rpm --root $VROOT --freshen --verbose $FRESHEN
+if [ -d $RPM_BUILD_DIR/../RPMS ] ; then
+    rpm --root $VROOT --freshen --verbose $RPM_BUILD_DIR/../RPMS/*/*.rpm
 fi
 
 # Remove stale RPM locks