From b7ea2f70581f6acd927ea7b65adaffeeb4b8d2ba Mon Sep 17 00:00:00 2001 From: Joshua McKenty Date: Wed, 7 Jul 2010 12:06:34 -0700 Subject: Capture signals from dnsmasq and use them to update network state. --- nova/utils.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'nova/utils.py') diff --git a/nova/utils.py b/nova/utils.py index 325b062ee..cbfdd835d 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -26,6 +26,7 @@ import logging import socket import sys import os.path +from os import environ import inspect import subprocess import random @@ -46,11 +47,14 @@ def fetchfile(url, target): # fp.close() execute("curl %s -o %s" % (url, target)) - -def execute(cmd, input=None): +def execute(cmd, input=None, addl_env=None): #logging.debug("Running %s" % (cmd)) + env = os.environ.copy() + if addl_env: + env.update(addl_env) + logging.debug(env) obj = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) result = None if input != None: result = obj.communicate(input) -- cgit