shebags mention python2 explicitly

[bootmanager.git] / source / steps / StartRunlevelAgent.py

diff --git a/source/steps/StartRunlevelAgent.py b/source/steps/StartRunlevelAgent.py
index 00c5f08..8343c4e 100644 (file)
--- a/source/steps/StartRunlevelAgent.py
+++ b/source/steps/StartRunlevelAgent.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
@@ -12,26 +12,25 @@ import os
 from Exceptions import *
 import BootAPI
 
-
-def Run( vars, log ):
+def Run(vars, log):
     """
         Start the RunlevelAgent.py script.  Should follow
         AuthenticateWithPLC() in order to guarantee that
         /etc/planetlab/session is present.
     """
 
-    log.write( "\n\nStep: Starting RunlevelAgent.py\n" )
+    log.write("\n\nStep: Starting RunlevelAgent.py\n")
 
     try:
-        cmd = "%s/monitor-runlevelagent" % vars['BM_SOURCE_DIR']
+        cmd = "{}/RunlevelAgent.py".format(vars['BM_SOURCE_DIR'])
         # raise error if script is not present.
         os.stat(cmd)
         # init script only starts RLA once.
-        os.system("/bin/sh %s start bootmanager" % cmd)
-    except KeyError, var:
-        raise BootManagerException, "Missing variable in vars: %s\n" % var
-    except ValueError, var:
-        raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var
+        os.system("/usr/bin/python2 {} start bootmanager &".format(cmd))
+    except KeyError as var:
+        raise BootManagerException("Missing variable in vars: {}\n".format(var))
+    except ValueError as var:
+        raise BootManagerException("Variable in vars, shouldn't be: {}\n".format(var))
 
     return 1