Merge lp:~mvo/click/lp1319790-chroot-fstab into lp:click

[Michael Vogt]

This branch may be a bit controversial, not sure. I ran into the issue that my $HOME is not on /home but instead on /space/home. This branch generates the fstab for the schroot more dynamically so that this case is taken into account.

However the autogeneration isn't exactly dynamic as its only done on create and AIUI the other commands do not require root so we can't easily update. So the branch helps but ideas/suggestions how to auto-generate fstab on each schroot command would be great.

Thanks,
 Michael

[lp:~mvo/click/lp1319790-chroot-fstab]

427. By Michael Vogt on 2014-05-20

click/commands/chroot.py: remove check for /etc/schroot/click/fstab. the fstab is auto-generated now

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/click/lp1319790-chroot-fstab/+merge/219728/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/click/lp1319790-chroot-fstab/+merge/219728/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-utopic-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Can this see work to get it in? See bug #1427264

[Timo Jyrinki (timo-jyrinki)]

And bug #1436835

[lp:~mvo/click/lp1319790-chroot-fstab]

428. By Michael Vogt on 2014-09-29

merged lp:click/devel

429. By Michael Vogt on 2015-05-08

merged lp:click, fixes conflicts, fixed tests

[Michael Vogt (mvo)]

Thanks Timo for the reminder and sorry that this was so long untouched. I updated the branch and resolved conflicts/updated tests. There is a bit of a reviewers shortage for click right now, I will try to find someone who can do a review.

Unmerged revisions

429. By Michael Vogt on 2015-05-08

merged lp:click, fixes conflicts, fixed tests

428. By Michael Vogt on 2014-09-29

merged lp:click/devel

427. By Michael Vogt on 2014-05-20

click/commands/chroot.py: remove check for /etc/schroot/click/fstab. the fstab is auto-generated now

426. By Michael Vogt on 2014-05-15

generate schroot fstab (more) dynamically to support $HOME != /home

=== modified file 'Makefile.am'
--- Makefile.am	2014-06-30 16:48:31 +0000
+++ Makefile.am	2015-05-08 06:28:53 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = lib preload click conf debhelper init po schroot
+SUBDIRS = lib preload click conf debhelper init po
 if PACKAGEKIT
 SUBDIRS += pk-plugin
 endif

=== modified file 'click/chroot.py'
--- click/chroot.py	2015-03-10 17:36:06 +0000
+++ click/chroot.py	2015-05-08 06:28:53 +0000
@@ -315,6 +315,8 @@
         else:
             self.user = pwd.getpwuid(os.getuid()).pw_name
         self.dpkg_architecture = self._dpkg_architecture()
+        # allow override in the tests
+        self.chroot_fstab = "/etc/schroot/click/fstab-autogenerated"
 
     def _get_native_arch(self, system_arch, target_arch):
         """Determine the proper native architecture for a chroot.
@@ -375,7 +377,7 @@
             {users}
             type=directory
             profile=default
-            setup.fstab=click/fstab
+            setup.fstab=click/fstab-autogenerated
             # Not protocols or services see
             # debian bug 557730
             setup.nssdatabases=sbuild/nssdatabases
@@ -480,6 +482,22 @@
         mode = stat.S_IMODE(os.stat(path).st_mode)
         os.chmod(path, mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
 
+    def _make_chroot_fstab(self):
+        with open(self.chroot_fstab, "w") as target:
+            target.write("""# fstab: static file system information for chroots.
+# Note that the mount point will be prefixed by the chroot path
+# (CHROOT_PATH)
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+/proc           /proc           none    rw,bind         0       0
+/sys            /sys            none    rw,bind         0       0
+/dev            /dev            none    rw,bind         0       0
+/dev/pts        /dev/pts        none    rw,bind         0       0
+/tmp            /tmp            none    rw,bind         0       0
+/run/shm        /run/shm        none    rw,bind         0       0
+{home}         {home}              none    rw,bind         0       0
+            """.format(home=os.path.expanduser("~")))
+
     def _make_cross_package(self, prefix):
         if self.native_arch == self.target_arch:
             return prefix
@@ -518,6 +536,10 @@
             build_pkgs.append(package)
         os.makedirs(mount)
 
+        # FIXME: hrm, hrm, this will work great until the user changes his
+        #        HOME
+        self._make_chroot_fstab()
+
         country_code = get_geoip_country_code_prefix()
         archive = "http://%sarchive.ubuntu.com/ubuntu" % country_code
         ports_mirror = "http://%sports.ubuntu.com/ubuntu-ports" % country_code
@@ -529,11 +551,13 @@
                                    self.target_arch,
                                    archive, ports_mirror,
                                    ' '.join(components))
+
         with open("%s/etc/apt/sources.list" % mount, "w") as sources_list:
             for line in sources:
                 print(line, file=sources_list)
         shutil.copy2("/etc/localtime", "%s/etc/" % mount)
         shutil.copy2("/etc/timezone", "%s/etc/" % mount)
+
         self._generate_chroot_config(mount)
         daemon_policy = self._generate_daemon_policy(mount)
         self._make_executable(daemon_policy)

=== modified file 'click/commands/chroot.py'
--- click/commands/chroot.py	2014-10-13 12:48:35 +0000
+++ click/commands/chroot.py	2015-05-08 06:28:53 +0000
@@ -258,8 +258,7 @@
     if not hasattr(args, "func"):
         parser.print_help()
         return 1
-    if (not osextras.find_on_path("schroot") or
-            not os.path.exists("/etc/schroot/click/fstab")):
+    if not osextras.find_on_path("schroot"):
         parser.error(
             "schroot not installed and configured; install click-dev and "
             "schroot")

=== modified file 'click/tests/test_chroot.py'
--- click/tests/test_chroot.py	2015-01-23 17:55:52 +0000
+++ click/tests/test_chroot.py	2015-05-08 06:28:53 +0000
@@ -40,6 +40,7 @@
         self.temp_dir = kwargs.pop("temp_dir")
         super(FakeClickChroot, self).__init__(*args, **kwargs)
         self._exists = False
+        self.chroot_fstab = os.path.join(self.temp_dir, "fstab-autogenerated")
 
     def exists(self):
         return self._exists
@@ -287,7 +288,7 @@
                 source-root-users=root,{user}
                 type=directory
                 profile=default
-                setup.fstab=click/fstab
+                setup.fstab=click/fstab-autogenerated
                 # Not protocols or services see
                 # debian bug 557730
                 setup.nssdatabases=sbuild/nssdatabases

=== removed file 'schroot/Makefile.am'
--- schroot/Makefile.am	2013-11-01 00:31:35 +0000
+++ schroot/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-schroot_clickdir = @sysconfdir@/schroot/click
-
-schroot_click_DATA = fstab

=== removed file 'schroot/fstab'
--- schroot/fstab	2014-11-04 13:29:54 +0000
+++ schroot/fstab	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-# fstab: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system> <mount point>   <type>  <options>       <dump>  <pass>
-/proc           /proc           none    rw,bind         0       0
-/sys            /sys            none    rw,bind         0       0
-/dev            /dev            none    rw,bind         0       0
-/dev/pts        /dev/pts        none    rw,bind         0       0
-/home           /home           none    rw,rbind        0       0
-/tmp            /tmp            none    rw,bind         0       0
-/run/shm        /run/shm        none    rw,bind         0       0