From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 29 Dec 2018 14:01:08 +0000 (+0100)
Subject: rely on a shebang in conf_files.py to choose between python2 or python3
X-Git-Tag: bootmanager-6.0-0~3
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=3a2a07818ad1b9a374a7ec78e8c4573a043dc338

rely on a shebang in conf_files.py to choose between python2 or python3
---

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 995d4ea..9c1e06c 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -114,7 +114,10 @@ def Run(vars, log):
 
     if (vars['ONE_PARTITION'] != '1'):
         try:
-            cmd = "/usr/bin/env python /usr/share/NodeManager/conf_files.py --noscripts"
+            # used to call /usr/bin/env python here, but as nodemanager
+            # now exists both in python2 and python3, we use a shebang
+            # in conf_files instead
+            cmd = "/usr/share/NodeManager/conf_files.py --noscripts"
             utils.sysexec_chroot(SYSIMG_PATH, cmd, log)
         except IOError as e:
             log.write("conf_files failed with \n {}".format(e))