Merge branch 'proc' into 'master'

Always mount /proc in chroot

Closes #18

See merge request larswirzenius/vmdb2!12

2 files changed, 33 insertions, 4 deletions

diff --git a/vmdb/plugins/grub_plugin.py b/vmdb/plugins/grub_plugin.py
index 3943f9b..937fffc 100644
--- a/vmdb/plugins/grub_plugin.py
+++ b/vmdb/plugins/grub_plugin.py
@@ -36,7 +36,7 @@
 # mount /dev into the chroot so the device is available.
 #
 # grub-install seems to also require /proc and /sys so we bind mount
-# those into the chroot as well.
+# /sys into the chroot as well. /proc is already mounted otherwise.
 #
 # We install the UEFI version of GRUB, and for that we additionally
 # bind mount the EFI partition in the image. Oh yeah, you MUST have
@@ -136,7 +136,7 @@ class GrubStepRunner(vmdb.StepRunnerInterface):
         else:
             efi_dev = None
 
-        self.bind_mount_many(chroot, ['/dev', '/proc', '/sys'], state)
+        self.bind_mount_many(chroot, ['/dev', '/sys'], state)
         if efi_dev:
             self.mount(chroot, efi_dev, '/boot/efi', state)
         self.install_package(chroot, grub_package)
diff --git a/vmdb/runcmd.py b/vmdb/runcmd.py
index 7ab57de..fa26f92 100644
--- a/vmdb/runcmd.py
+++ b/vmdb/runcmd.py
@@ -18,6 +18,7 @@
 
 import logging
 import os
+import subprocess
 import sys
 
 import cliapp
@@ -53,8 +54,36 @@ def runcmd(argv, *argvs, **kwargs):
 
 
 def runcmd_chroot(chroot, argv, *argvs, **kwargs):
-    full_argv = ['chroot', chroot] + argv
-    return runcmd(full_argv, *argvs, **kwargs)
+    _mount_proc(chroot)
+    try:
+        full_argv = ['chroot', chroot] + argv
+        return runcmd(full_argv, *argvs, **kwargs)
+    except Exception:
+        _unmount_proc(chroot)
+        raise
+    finally:
+        _unmount_proc(chroot)
+
+
+def _mount_proc(chroot):
+    proc = _procdir(chroot)
+    argv = ['chroot', chroot, 'mount', '-t', 'proc', 'proc', '/proc']
+    progress('mounting proc: %r' % argv)
+    subprocess.check_call(argv)
+
+
+def _unmount_proc(chroot):
+    proc = _procdir(chroot)
+    argv = ['chroot', chroot, 'umount', '/proc']
+    progress('unmounting proc: %r' % argv)
+    subprocess.check_call(argv)
+
+
+def _procdir(chroot):
+    proc = os.path.join(chroot, 'proc')
+    if not os.path.exists(proc):
+        os.mkdir(proc, mode=Oo755)
+    return proc
 
 
 def _log_stdout(data):