From 64861f8dba8bd038c3ddfeb48dbef140a4332c6a Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@gmail.com>
Date: Wed, 29 Oct 2014 18:13:52 +0000
Subject: Make deployment extensions use unshared_cmdline

---
 morphlib/extensions.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'morphlib')

diff --git a/morphlib/extensions.py b/morphlib/extensions.py
index 6b81e116..b270d304 100644
--- a/morphlib/extensions.py
+++ b/morphlib/extensions.py
@@ -223,10 +223,7 @@ class ExtensionSubprocess(object):
             def close_read_end():
                 os.close(log_read_fd)
             p = subprocess.Popen(
-                # We unshare and mount --make-rprivate so mounts done by write
-                # extensions can't interfere with the rest of the system.
-                ['unshare', '-m', '--', '/bin/sh', '-c',
-                 'mount --make-rprivate / && exec "$@"', '-', filename] + args,
+                morphlib.util.unshared_cmdline([filename] + list(args)),
                 cwd=cwd, env=new_env,
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                 preexec_fn=close_read_end)
-- 
cgit v1.2.1