CACERT_PATH still in /mnt/cdrom, will be moved later to /etc/planetlab

diff --git a/source/configuration b/source/configuration
index 10b6e04..1e78809 100644 (file)
--- a/source/configuration
+++ b/source/configuration
@@ -20,6 +20,12 @@ TEMP_PATH=/mnt/tmp
 SYSIMG_PATH=/mnt/tmp/sysimg
 
 
+# where the cacerts for the boot cd can be found
+# currently, this must start with /mnt/cdrom
+# which is hardcoded in the installer
+CACERT_PATH=/mnt/cdrom/bootme/cacert
+
+
 # the nonce the boot cd created, need to authenticate
 # requests that are made to the boot server
 NONCE_FILE=/tmp/nonce

diff --git a/source/steps/InstallBase.py b/source/steps/InstallBase.py
index 4c14d81..e8e0057 100644 (file)
--- a/source/steps/InstallBase.py
+++ b/source/steps/InstallBase.py
@@ -55,6 +55,7 @@ def Run( vars, log ):
     SYSIMG_PATH           the path where the system image will be mounted
                           (always starts with TEMP_PATH)
     INSTALL_LANGS         languages for install (used by rpm)
+    CACERT_PATH           where the boot server certificates are
                          
     Sets the following variables:
     None
@@ -77,6 +78,10 @@ def Run( vars, log ):
         if INSTALL_LANGS == "":
             raise ValueError, "INSTALL_LANGS"
 
+        CACERT_PATH= vars["CACERT_PATH"]
+        if CACERT_PATH == "":
+            raise ValueError, "CACERT_PATH"
+
     except KeyError, var:
         raise BootManagerException, "Missing variable in vars: %s\n" % var
     except ValueError, var: