Update instructions

diff --git a/geni/aggregate.py b/geni/aggregate.py
index 343f1eb..702c3bb 100644 (file)
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -40,7 +40,7 @@ class Aggregate(GeniServer):
     # @param key_file private key filename of registry
     # @param cert_file certificate filename containing public key (could be a GID file)     
 
-    def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/geni/util/geni_config"):
+    def __init__(self, ip, port, key_file, cert_file, config = "/etc/planetlab/geni_config"):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.key_file = key_file
         self.cert_file = cert_file

diff --git a/geni/plc.py b/geni/plc.py
index 6294b55..a115790 100644 (file)
--- a/geni/plc.py
+++ b/geni/plc.py
@@ -14,10 +14,10 @@
 # is up to date and accurate.
 #
 # 1) Import the existing planetlab database, creating the
-#    appropriate geni records. This is done by running the "import.py" tool.
+#    appropriate geni records. This is done by running the "gimport.py" tool.
 #
 # 2) Create a "trusted_roots" directory and place the certificate of the root
-#    authority in that directory. Given the defaults in import.py, this
+#    authority in that directory. Given the defaults in gimport.py, this
 #    certificate would be named "planetlab.gid". For example,
 #
 #    mkdir trusted_roots; cp authorities/planetlab.gid trusted_roots/

diff --git a/geni/slicemgr.py b/geni/slicemgr.py
index 9138923..87fcc0f 100644 (file)
--- a/geni/slicemgr.py
+++ b/geni/slicemgr.py
@@ -39,7 +39,7 @@ class SliceMgr(GeniServer):
     # @param key_file private key filename of registry
     # @param cert_file certificate filename containing public key (could be a GID file)     
 
-    def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/geni/util/geni_config"):
+    def __init__(self, ip, port, key_file, cert_file, config = os.getcwd() + "/geni/util/geni_config"):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.key_file = key_file
         self.cert_file = cert_file