X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=a00e3631a7db9afe1801de96a7faef1ec89f6300;hb=feca8574e06341a61c27e039fb0979018a9d3d2a;hp=f9df9bc8815a9f5f9382d74853f8fedd7bdd9c83;hpb=bb4b0af7f5c3b030d74f22021e5c3cc20ad17fe1;p=bootmanager.git

diff --git a/build.sh b/build.sh
index f9df9bc..a00e363 100755
--- a/build.sh
+++ b/build.sh
@@ -10,9 +10,6 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2004-2007 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.5 2006/04/03 19:40:55 mlhuang Exp $
-# $URL$
-#
 
 # Source PLC configuration
 . /etc/planetlab/plc_config
@@ -28,19 +25,16 @@ BOOTSTRAPDIR="/boot"
 # Change to our source directory
 cd $(dirname $0)
 
-# Translate configuration file
-sed -i -e "s|SUPPORT_FILE_DIR=.*|SUPPORT_FILE_DIR=$BOOTSTRAPDIR|" source/configuration
-
 # Source bootmanager configuration
-. $srcdir/source/configuration
+. source/configuration
 
 # Write boot script. nodeconfig/boot/index.php retrieves the contents of this script
 # after checking the node id
 
-BMDIR=/var/www/html/bootmanager
+BMDIR=/var/www/html/boot
 mkdir -p $BMDIR
 
-DEST_SCRIPT="$BMDIR/${DEPLOYMENT}_bootmanager.sh"
+DEST_SCRIPT="$BMDIR/bootmanager_${DEPLOYMENT}.sh"
 # Remove the old version or any sym links prior to re-writing
 rm -f ${DEST_SCRIPT}
 rm -f ${DEST_SCRIPT}.sgn
@@ -88,21 +82,12 @@ cat <<EOF > $DEST_SCRIPT
 # Do not tolerate errors
 set -e
 
-UUDECODE=/usr/bin/uudecode
-
-# once we get the beta cds out of use, this can be removed
-if [ ! -x \$UUDECODE ]; then
-  UUDECODE=/tmp/uudecode
-  curl -s http://$PLC_BOOT_HOST/boot/uudecode.gz | gzip -d -c > \$UUDECODE
-  chmod +x \$UUDECODE
-fi
-
-($UUDECODE | /bin/tar -C /tmp -xj) << _EOF_
+(/usr/bin/uudecode | /bin/tar -C /tmp -xj) << _EOF_
 EOF
 
 
 # Embed the uuencoded tarball in the script
-tar -cj -C $srcdir source/ -C $extra_libs source/ | uuencode -m - >> $DEST_SCRIPT
+tar -cj source/ -C $extra_libs source/ | uuencode -m - >> $DEST_SCRIPT
 
 # wrap up the script
 echo '_EOF_' >> $DEST_SCRIPT