- revert to 1.36 (install boot server cert, which may optionally be a

  third-party CA cert)

diff --git a/build.sh b/build.sh
index 4dfd723..6d5ddc0 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.36 2006/04/07 03:59:10 mlhuang Exp $
+# $Id$
 #
 
 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_ROOT_CA_SSL_CRT=configurations/$CONFIGURATION/$PRIMARY_SERVER_CERT
+    PLC_BOOT_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_ROOT_CA_SSL_CRT $dir/cacert.pem
+       install -D -m 644 $PLC_BOOT_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_ROOT_CA_SSL_CRT $overlay/usr/bootme/cacert/$PLC_BOOT_HOST/cacert.pem
+install -D -m 644 $PLC_BOOT_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