Merge lp:~ursinha/uci-engine/add-run-lock-to-imagebuild-chroot into lp:uci-engine

[Ursula Junque]

Initial fix for bug 1337877. It adds /run/lock to the image chroot, mounting it properly.

Initial fix for bug 1337877. It adds /run/lock to the image chroot, mounting it properly.

[Celso Providelo (cprov)]

Thanks for working on this.

I presume this is the change that successfully worked for the click-ticket. If I understand correctly, it gives a specific tmpfs '/run/lock' for the baked chroot lifetime. It seems correct to me.

As far as the image-builder is concerned, it's great and should be landed. Since the test-runner initiating this image as a new node, I assume it will also have a proper '/run/lock' and we will be fine.

Great work finding and fixing the problem.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:648
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1016/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1016/rebuild

review: Approve (continuous-integration)

=== modified file 'image-builder/imagebuilder/cloud_image.py'
--- image-builder/imagebuilder/cloud_image.py	2014-06-27 16:35:16 +0000
+++ image-builder/imagebuilder/cloud_image.py	2014-07-04 21:17:38 +0000
@@ -227,9 +227,17 @@
                                  self.nbd_dev)
         runcmd('udevadm settle')
         runcmd('mount /dev/%sp1 %s' % (self.nbd_dev, mountpoint))
+
         # Mount /proc /sys and /dev in the image
         for bmount in ['/proc', '/sys', '/dev']:
             runcmd('mount --bind %s %s/%s' % (bmount, mountpoint, bmount))
+
+        # Creating /run/lock
+        run_lock = os.path.join(mountpoint, 'run', 'lock')
+        os.mkdir(run_lock)
+        runcmd(
+            'mount -t tmpfs -o nodev,noexec,nosuid,size=5242880 none '
+            '{}'.format(run_lock))
         # Backup resolv.conf and copy in the one from the local system
         if os.path.lexists('%s/etc/resolv.conf' % mountpoint):
             shutil.move('%s/etc/resolv.conf' % mountpoint,
@@ -254,6 +262,10 @@
     def _umount_image(self):
         for bmount in ['/proc', '/sys', '/dev']:
             runcmd('umount %s/%s' % (self.mountpoint, bmount))
+        # Removing /run/lock
+        run_lock = os.path.join(self.mountpoint, 'run', 'lock')
+        runcmd('umount {}'.format(run_lock))
+        shutil.rmtree(run_lock)
         if os.path.lexists('%s/etc/resolv.conf.orig' % self.mountpoint):
             shutil.move('%s/etc/resolv.conf.orig' % self.mountpoint,
                         '%s/etc/resolv.conf' % self.mountpoint)