Merge lp:~sergiusens/click/schroot_configuration_overlay_detection into lp:click

[Sergio Schvezov]

[Colin Watson (cjwatson)]

review: Approve

[lp:~sergiusens/click/schroot_configuration_overlay_detection]

627. By Sergio Schvezov on 2017-06-07

Use the correct overlayfs module name for the chroot configuration

628. By Sergio Schvezov on 2017-06-07

helper to modprobe overlay

=== modified file 'click_package/chroot.py'
--- click_package/chroot.py	2015-12-29 01:12:58 +0000
+++ click_package/chroot.py	2017-06-07 18:50:49 +0000
@@ -34,6 +34,7 @@
     from urllib2 import URLError, urlopen
 import os
 import pwd
+import fileinput
 import re
 import shutil
 import stat
@@ -383,6 +384,13 @@
                     dpkg_architecture[new_key] = dpkg_architecture[key]
         return dpkg_architecture
 
+    def _get_overlayfs_name(self):
+        for line in fileinput.input("/proc/filesystems"):
+            if line.strip() == "nodev\toverlay":
+                fileinput.close()
+                return "overlay"
+        return "overlayfs"
+
     def _generate_chroot_config(self, mount):
         admin_user = "root"
         users = []
@@ -399,12 +407,13 @@
             # Not protocols or services see
             # debian bug 557730
             setup.nssdatabases=sbuild/nssdatabases
-            union-type=overlayfs
+            union-type={overlayfs_name}
             directory={mount}
             """).format(full_name=self.full_name,
                         target_arch=self.target_arch,
                         users="\n".join(users),
-                        mount=mount))
+                        mount=mount,
+                        overlayfs_name=self._get_overlayfs_name()))
 
     def _generate_daemon_policy(self, mount):
         daemon_policy = "%s/usr/sbin/policy-rc.d" % mount

=== modified file 'click_package/tests/integration/helpers.py'
--- click_package/tests/integration/helpers.py	2014-09-05 09:04:33 +0000
+++ click_package/tests/integration/helpers.py	2017-06-07 18:50:49 +0000
@@ -40,6 +40,13 @@
         pass
 
 
+def require_overlay():
+    try:
+        subprocess.check_call(["/sbin/modprobe", "overlay"])
+    except subprocess.CalledProcessError:
+        raise unittest.SkipTest("Requires overlay fs support")
+
+
 @contextlib.contextmanager
 def chdir(target):
     curdir = os.getcwd()

=== modified file 'click_package/tests/integration/test_build_core_apps.py'
--- click_package/tests/integration/test_build_core_apps.py	2015-12-29 04:13:08 +0000
+++ click_package/tests/integration/test_build_core_apps.py	2017-06-07 18:50:49 +0000
@@ -26,6 +26,7 @@
 from .helpers import (
     chdir,
     require_network,
+    require_overlay,
     require_root,
     ClickTestCase,
 )
@@ -74,6 +75,7 @@
         super(TestBuildCoreApps, cls).setUpClass()
         require_root()
         require_network()
+        require_overlay()
 
     def _run_in_chroot(self, cmd):
         """Run the given cmd in a click chroot"""

=== modified file 'click_package/tests/integration/test_chroot.py'
--- click_package/tests/integration/test_chroot.py	2015-12-29 04:19:12 +0000
+++ click_package/tests/integration/test_chroot.py	2017-06-07 18:50:49 +0000
@@ -20,6 +20,7 @@
 
 from .helpers import (
     require_network,
+    require_overlay,
     require_root,
     ClickTestCase,
 )
@@ -50,6 +51,7 @@
         super(TestChroot, cls).setUpClass()
         require_root()
         require_network()
+        require_overlay()
         cls.arch = subprocess.check_output(
             ["dpkg", "--print-architecture"], universal_newlines=True).strip()
         subprocess.check_call(cls.command(cls.arch, "create"))

=== modified file 'click_package/tests/test_chroot.py'
--- click_package/tests/test_chroot.py	2017-06-07 18:50:49 +0000
+++ click_package/tests/test_chroot.py	2017-06-07 18:50:49 +0000
@@ -298,9 +298,10 @@
                 # Not protocols or services see
                 # debian bug 557730
                 setup.nssdatabases=sbuild/nssdatabases
-                union-type=overlayfs
+                union-type={overlayfs}
                 directory={temp_dir}
-                """).format(user="meep", temp_dir=self.temp_dir))
+                """).format(user="meep", temp_dir=self.temp_dir,
+                            overlayfs=chroot._get_overlayfs_name()))
 
     def test_chroot_create_mocked(self):
         self.use_temp_dir()

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-07 18:50:49 +0000
+++ debian/changelog	2017-06-07 18:50:49 +0000
@@ -2,6 +2,8 @@
 
   * Rename the python package this installs from click to click_package.
     (LP: #1693226)
+  * Use the correct overlayfs module name for the chroot configuration.
+    (LP: #1696402)
 
  -- Sergio Schvezov <[e-mail]>  Fri, 26 May 2017 13:03:44 -0300
 

=== modified file 'debian/control'
--- debian/control	2017-06-07 18:50:49 +0000
+++ debian/control	2017-06-07 18:50:49 +0000
@@ -29,7 +29,7 @@
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${perl:Depends}, python3-click-package (= ${binary:Version})
-Recommends: debootstrap, schroot, dpkg-dev
+Recommends: debootstrap, schroot (>= 1.6.10-2~), dpkg-dev
 Description: build Click packages
  Click is a simplified packaging format that installs in a separate part of
  the file system, suitable for third-party applications.