naoki: Add optional support for loop devices in chroot.

I do not normally want them here because they can be a risk
for the host system.

diff --git a/naoki/environ.py b/naoki/environ.py
index 4987eac5e1268a39e80054b07f07afbe18c0bc9e..2c322336f068e505fab663bcc6e22274673714ea 100644 (file)
--- a/naoki/environ.py
+++ b/naoki/environ.py
@@ -30,9 +30,14 @@ def set(e):
 class _Environment(object):
        kernel_version = os.uname()[2]
 
-       def __init__(self, arch):
+       def __init__(self, arch, **settings):
                self.arch = arch
 
+               self._settings = {
+                       "enable_loop" : False,
+               }
+               self._settings.update(settings)
+
                logging.debug("Successfully initialized %s" % self)
 
                # XXX check if already locked
@@ -107,6 +112,10 @@ class _Environment(object):
                        (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console")
                ]
 
+               if self._settings["enable_loop"]:
+                       for i in range(0, 7):
+                               devNodes.append((stat.S_IFBLK | 0660, os.makedev(7, i), "dev/loop%d" % i))
+
                # make device node for el4 and el5
                if self.kernel_version < "2.6.19":
                        devNodes.append((stat.S_IFCHR | 0666, os.makedev(5, 2), "dev/ptmx"))

diff --git a/naoki/generators.py b/naoki/generators.py
index bcb027bee84de7229604ed715cc77f7c85881969..d6c73825dbe3ceb550e9b41d12136e5c0729f9f4 100644 (file)
--- a/naoki/generators.py
+++ b/naoki/generators.py
@@ -13,7 +13,7 @@ from environ import _Environment
 
 class Generator(_Environment):
        def __init__(self, type, arch=None):
-               _Environment.__init__(self, arch)
+               _Environment.__init__(self, arch, enable_loop=True)
 
                self.type = type