From bfdb9b1f5e197a0d2f76f7d32835c521e5b30d6f Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Mon, 23 Jan 2012 11:17:34 +0100
Subject: Fix environment passing in DnsmasqFilter

Fix environment passing in DnsmasqFilter so that dnsmasq can
be run as root through nova-rootwrap. Fixes bug 919275.

Change-Id: I2e78d92b9af4ddea9c0f1c5ddbe2d55fb672310e
---
 bin/nova-rootwrap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-rootwrap b/bin/nova-rootwrap
index 80bb55ca8..0434aed3a 100755
--- a/bin/nova-rootwrap
+++ b/bin/nova-rootwrap
@@ -65,7 +65,8 @@ if __name__ == '__main__':
         obj = subprocess.Popen(filtermatch.get_command(userargs),
                                stdin=sys.stdin,
                                stdout=sys.stdout,
-                               stderr=sys.stderr)
+                               stderr=sys.stderr,
+                               env=filtermatch.get_environment(userargs))
         sys.exit(obj.returncode)
 
     print "Unauthorized command: %s" % ' '.join(userargs)
-- 
cgit