Ubuntu Pastebin

Paste from sergiusens at Wed, 7 Jun 2017 11:18:14 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
=== modified file 'click_package/chroot.py'
--- click_package/chroot.py	2015-12-29 01:12:58 +0000
+++ click_package/chroot.py	2017-06-07 11:17:59 +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/test_chroot.py'
--- click_package/tests/test_chroot.py	2017-05-26 16:02:13 +0000
+++ click_package/tests/test_chroot.py	2017-06-07 11:15:48 +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()
Download as text