Merge branch 'ipv6'

[nodemanager.git] / bootauth.py

diff --git a/bootauth.py b/bootauth.py
index 44f9a8f..dae075c 100755 (executable)
--- a/bootauth.py
+++ b/bootauth.py
@@ -1,16 +1,11 @@
 #!/usr/bin/python
 #
-# Test script for obtaining a node session key. Usually, the Boot
-# Manager obtains it, then writes it to /etc/planetlab/session. To
-# generate a node key for a node, execute:
-#
-# AdmGenerateNodeConfFile(node_id)
+# Obtaining a node session key. Usually, the Boot
+# Manager obtains it, then writes it to /etc/planetlab/session.
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: bootauth.py,v 1.1 2006/10/31 23:19:28 mlhuang Exp $
-#
 
 import os, sys
 import getopt
@@ -36,8 +31,9 @@ def main():
 
     # Get options
     try:
-        (opts, argv) = getopt.getopt(sys.argv[1:], "n:k:h",
-                                     ["node=", "nodeid=", "node-id", "node_id",
+        (opts, argv) = getopt.getopt(sys.argv[1:], "f:n:k:h",
+                                     ["config=", "cfg=", "file=",
+                                      "node=", "nodeid=", "node-id", "node_id",
                                       "key=",
                                       "help"])
     except getopt.GetoptError, err: