Merge branch 'master' into lxc_devel

[nodemanager.git] / nodemanager.py

diff --git a/nodemanager.py b/nodemanager.py
index 4e82165..68a8be4 100755 (executable)
--- a/nodemanager.py
+++ b/nodemanager.py
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 #
-# $Id$
-# $URL$
-#
 # Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager
 #
 
@@ -51,8 +48,6 @@ class NodeManager:
         parser = optparse.OptionParser()
         parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False,
                           help='run daemonized')
-        parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False,
-                          help='run all sliver startup scripts')
         parser.add_option('-f', '--config', action='store', dest='config', default='/etc/planetlab/plc_config',
                           help='PLC configuration file')
         parser.add_option('-k', '--session', action='store', dest='session', default='/etc/planetlab/session',
@@ -201,7 +196,7 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
                 try:
                     m = __import__(module)
                     logger.verbose("nodemanager: triggering %s.start"%m.__name__)
-                    m.start(self.options, config)
+                    m.start()
                     self.loaded_modules.append(m)
                 except ImportError, err:
                     print "Warning while loading module %s:" % module, err