X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=411111c8be926f45ce3b304662b3e6f486d14081;hb=cca3a2cd2096c0235dddb5982b1f05c8d4c7f916;hp=3febbbb8cc54612ae4f6f5700b2c64071af184d3;hpb=7d53ddb3d5f6542f7894e6443bbfe1b57d0a5468;p=bootmanager.git

diff --git a/build.sh b/build.sh
index 3febbbb..411111c 100755
--- a/build.sh
+++ b/build.sh
@@ -50,6 +50,7 @@ if [ -n "$NODEGROUP" ] ; then
 	DEST_SCRIPT="${NODEGROUP}_bootmanager.sh"
 	# Remove the old version or any sym links prior to re-writing
 	rm -f ${DEST_SCRIPT}
+	rm -f ${DEST_SCRIPT}.sgn
 fi
 
 cat > $DEST_SCRIPT <<EOF
@@ -84,21 +85,36 @@ echo '($UUDECODE | /bin/tar -C /tmp -xj) << _EOF_' >> $DEST_SCRIPT
 sed -i -e "s@^BOOT_API_SERVER.*@BOOT_API_SERVER=https://$PLC_API_HOST:443/$PLC_API_PATH/@" \
     $srcdir/source/configuration
 
+sed -i -e "s@^BOOT_SERVER.*@BOOT_SERVER=$PLC_BOOT_HOST@" $srcdir/source/configuration
+if [ "$PLC_MONITOR_ENABLED" = "1" ]; then
+    MONITOR_SERVER=$PLC_MONITOR_HOST
+else
+    MONITOR_SERVER=$PLC_BOOT_HOST
+fi
+sed -i -e "s@^MONITOR_SERVER.*@MONITOR_SERVER=$MONITOR_SERVER@" $srcdir/source/configuration
+
+install -D -m 644 $PLC_BOOT_CA_SSL_CRT $srcdir/source/cacert/$PLC_BOOT_HOST/cacert.pem
+if [ -f $PLC_MONITOR_CA_SSL_CRT ] ; then 
+	install -D -m 644 $PLC_MONITOR_CA_SSL_CRT $srcdir/source/cacert/$PLC_MONITOR_HOST/cacert.pem
+fi
+
 # Replace the default debug SSH key
 if [ -f "$PLC_DEBUG_SSH_KEY_PUB" ] ; then
     install -D -m 644 "$PLC_DEBUG_SSH_KEY_PUB" $srcdir/source/debug_files/debug_root_ssh_key
 fi
 
-# Add pypcilib
-pypcilib=`mktemp -d "/tmp/.bootmanager.XXXXXX"`
-mkdir $pypcilib/source
-cp $(rpm -ql pypcilib | grep -v '\.py[co]$') $pypcilib/source
+# Add python code from the following packages
+# make sure they are in the 'Requires' header of the specfile
+required_rpms="pypcilib pyplnet monitor-runlevelagent"
+extra_libs=`mktemp -d "/tmp/.bootmanager.XXXXXX"`
+mkdir $extra_libs/source
+cp -p $(rpm -ql $required_rpms | grep -v '\.py[co]$') $extra_libs/source
 
 # Embed the uuencoded tarball in the script
-tar -cj -C $srcdir source/ -C $pypcilib source/ | uuencode -m - >> $DEST_SCRIPT
+tar -cj -C $srcdir source/ -C $extra_libs source/ | uuencode -m - >> $DEST_SCRIPT
 
 # Remove temp directory
-rm -fr $pypcilib
+rm -fr $extra_libs
 
 echo '_EOF_' >> $DEST_SCRIPT
 echo 'cd /tmp/source' >> $DEST_SCRIPT