From 10f60201771b07595915dc0ffe8355966fc97faa Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Thu, 13 Jul 2006 17:51:49 +0000 Subject: [PATCH] - install the cert of the CA that signed the boot server cert on the bootcd - if /etc/planetlab/plc_config is not a valid myplc configuration (maybe a myplc-devel configuration), try static configuration --- build.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 6d5ddc0..212c5ce 100755 --- a/build.sh +++ b/build.sh @@ -64,7 +64,10 @@ BOOTCD_VERSION=$(cat build/version.txt) if [ -f /etc/planetlab/plc_config ] ; then # Source PLC configuration . /etc/planetlab/plc_config -elif [ -d configurations/$CONFIGURATION ] ; then +fi + +# If PLC configuration is not valid, try a static configuration +if [ -z "$PLC_BOOT_CA_SSL_CRT" -a -d configurations/$CONFIGURATION ] ; then # (Deprecated) Source static configuration . configurations/$CONFIGURATION/configuration PLC_NAME="PlanetLab" @@ -76,7 +79,7 @@ elif [ -d configurations/$CONFIGURATION ] ; then fi PLC_BOOT_HOST=$PRIMARY_SERVER PLC_BOOT_SSL_PORT=$PRIMARY_SERVER_PORT - PLC_BOOT_SSL_CRT=configurations/$CONFIGURATION/$PRIMARY_SERVER_CERT + PLC_BOOT_CA_SSL_CRT=configurations/$CONFIGURATION/$PRIMARY_SERVER_CERT PLC_ROOT_GPG_KEY_PUB=configurations/$CONFIGURATION/$PRIMARY_SERVER_GPG fi @@ -105,7 +108,7 @@ echo "* Installing boot server configuration files" # but never got around to it. Just install the same parameters for # both for now. for dir in $overlay/usr/boot $overlay/usr/boot/backup ; do - install -D -m 644 $PLC_BOOT_SSL_CRT $dir/cacert.pem + install -D -m 644 $PLC_BOOT_CA_SSL_CRT $dir/cacert.pem install -D -m 644 $PLC_ROOT_GPG_KEY_PUB $dir/pubring.gpg echo "$PLC_BOOT_HOST" >$dir/boot_server echo "$PLC_BOOT_SSL_PORT" >$dir/boot_server_port @@ -113,7 +116,7 @@ for dir in $overlay/usr/boot $overlay/usr/boot/backup ; do done # (Deprecated) Install old-style boot server configuration files -install -D -m 644 $PLC_BOOT_SSL_CRT $overlay/usr/bootme/cacert/$PLC_BOOT_HOST/cacert.pem +install -D -m 644 $PLC_BOOT_CA_SSL_CRT $overlay/usr/bootme/cacert/$PLC_BOOT_HOST/cacert.pem echo "$FULL_VERSION_STRING" >$overlay/usr/bootme/ID echo "$PLC_BOOT_HOST" >$overlay/usr/bootme/BOOTSERVER echo "$PLC_BOOT_HOST" >$overlay/usr/bootme/BOOTSERVER_IP -- 2.43.0