From 46329367334dbbc9fb3d62334d5759ad4784b0de Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Fri, 7 Nov 2014 16:12:06 +0100 Subject: [PATCH] We actually don't need all the process stuff --- .../debian/config/opt/cloud/bin/update_config.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py index 7cc9d70c30b..606e6c2ad55 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py @@ -7,6 +7,7 @@ import subprocess from subprocess import PIPE, STDOUT import os import os.path +import configure logging.basicConfig(filename='/var/log/cloud.log',level=logging.DEBUG, format='%(asctime)s %(message)s') @@ -33,16 +34,6 @@ qf.setFile(sys.argv[1]) qf.load(None) # Converge -run = subprocess.Popen(["/opt/cloud/bin/configure.py"], - stdin=PIPE, stdout=PIPE, stderr=PIPE) -run.wait() +returncode = configure.main([]) -if run.returncode: - print "stdout >>" - print run.stdout.read() - print "stderr >>" - print run.stderr.read() -else: - print "Convergence is achieved - you have been assimilated!" - -sys.exit(run.returncode) +sys.exit(returncode)