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

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

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 1282542..9c1e06c 100644 (file)
--- 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))
@@ -236,7 +239,8 @@ def Run(vars, log):
     # there are a few buggy drivers that don't disable their hardware
     # correctly unless they are first unloaded.
 
-    utils.sysexec_noerr("ifconfig eth0 down", log)
+    utils.sysexec_noerr("ifconfig eth0 down || /usr/libexec/nm-ifdown eth0",
+                        log, shell=True)
 
     utils.sysexec_noerr("killall dhclient", log)