X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=ee4bd32dbc6b63d6ecc192d19a92a1d8d1346bb1;hb=fc0046387e3d654a23097f50eb735e00ffda41a1;hp=06e9f00a30bee5b71226d6aa562d0e24f6f0bf47;hpb=0f6d1a768aa03d38861c5011333135a8068eac2c;p=bootmanager.git diff --git a/build.sh b/build.sh index 06e9f00..ee4bd32 100755 --- a/build.sh +++ b/build.sh @@ -10,9 +10,6 @@ # Marc E. Fiuczynski # 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,9 +25,6 @@ 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 . source/configuration @@ -58,8 +52,8 @@ fi sed -i -e "s@^MONITOR_SERVER.*@MONITOR_SERVER=$MONITOR_SERVER@" source/configuration install -D -m 644 $PLC_BOOT_CA_SSL_CRT source/cacert/$PLC_BOOT_HOST/cacert.pem -if [ -f $PLC_MONITOR_CA_SSL_CRT ] ; then - install -D -m 644 $PLC_MONITOR_CA_SSL_CRT source/cacert/$PLC_MONITOR_HOST/cacert.pem +if [ -f "$PLC_MONITOR_CA_SSL_CRT" ] ; then + install -D -m 644 "$PLC_MONITOR_CA_SSL_CRT" source/cacert/$PLC_MONITOR_HOST/cacert.pem fi # Replace the default debug SSH key @@ -69,7 +63,7 @@ fi # Add python code from the following packages # make sure they are in the 'Requires' header of the specfile -required_rpms="pypcilib pyplnet monitor-runlevelagent" +required_rpms="pypcilib pyplnet" extra_libs=`mktemp -d "/tmp/.bootmanager.XXXXXX"` mkdir $extra_libs/source cp -p $(rpm -ql $required_rpms | grep -v '\.py[co]$') $extra_libs/source