From: Mark Huang Date: Fri, 23 Jun 2006 20:28:31 +0000 (+0000) Subject: - install root CA SSL certificate instead of boot server certificate X-Git-Tag: bootcd-3.4-2~71 X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=3f277e1cd9d57177d6d57394e94e1ceb08f89d2c - install root CA SSL certificate instead of boot server certificate --- diff --git a/build.sh b/build.sh index 7041ea6..4dfd723 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: build.sh,v 1.35 2006/04/07 03:58:07 mlhuang Exp $ +# $Id: build.sh,v 1.36 2006/04/07 03:59:10 mlhuang Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -76,7 +76,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_ROOT_CA_SSL_CRT=configurations/$CONFIGURATION/$PRIMARY_SERVER_CERT PLC_ROOT_GPG_KEY_PUB=configurations/$CONFIGURATION/$PRIMARY_SERVER_GPG fi @@ -105,7 +105,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_ROOT_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 +113,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_ROOT_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