releasing package livecd-rootfs version 2.441.8

accidentally dropped in previous upload.

debian/changelog

@@ -1,3 +1,64 @@
+livecd-rootfs (2.441.8) zesty; urgency=medium
+
+  [ Robert C Jennings ]
+  * Install udev before calls to udevadm
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 13 Sep 2017 22:27:45 -0700
+
+livecd-rootfs (2.441.7) zesty; urgency=medium
+
+  * Restore the call to 'umount -R $mountpoint' from umount_partition,
+    accidentally dropped in previous upload.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 13 Sep 2017 12:48:29 -0700
+
+livecd-rootfs (2.441.6) zesty; urgency=medium
+
+  [ Robert C Jennings ]
+  * live-build/ubuntu-cpc/functions: Add a function, teardown_mountpoint,
+    to reverse the work done in setup_mountpoint.  Lack of this function
+    has forced users of setup_mountpoint to implement this separately
+    and the implementations have diverged. (LP: #1716992)
+  * live-build/ubuntu-cpc/functions: Remove umount_settle function.
+    The was only used where teardown_mountpoint was lacking.
+
+  [ Steve Langasek ]
+  * Also adjust live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+    to use teardown_mountpoint.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 13 Sep 2017 12:13:10 -0700
+
+livecd-rootfs (2.441.5) zesty; urgency=medium
+
+  [ Colin Watson ]
+  * Mount and unmount /dev recursively, to cope with setups where there are
+    interesting bind-mounts under /dev (e.g. loop devices bind-mounted by
+    LXD).  LP: #1716465.
+
+  [ Balint Reczey ]
+  * Fix suppression of kpartx error.  LP: #1684090.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 11 Sep 2017 11:59:59 -0700
+
+livecd-rootfs (2.441.4) zesty; urgency=medium
+
+  [ Balint Reczey ]
+  * wrap kpartx and trap spurious errors, to work around kpartx
+    unreliability as seen in autopkgtests. (LP: #1684090)
+
+  [ Steve Langasek ]
+  * Mark autopkgtests isolation-machine since debootstrap won't work in a
+    container.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 06 Jun 2017 23:09:10 -0700
+
+livecd-rootfs (2.441.3) zesty; urgency=medium
+
+  * live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure.
+    (LP: #1687752)
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Tue, 09 May 2017 13:46:01 -0700
+
 livecd-rootfs (2.441.2) zesty; urgency=medium
 
   * The ubuntu-server:live should use a casper-based initramfs to work

debian/tests/control

@@ -1,3 +1,3 @@
 Tests: default-bootstraps
 Depends: @, lsb-release
-Restrictions: needs-root
+Restrictions: needs-root isolation-machine

live-build/functions

@@ -11,9 +11,22 @@ backing_img=
 apt-get -qqy install dosfstools gdisk
 
 clean_loops() {
+    local kpartx_ret
+    local kpartx_stdout
 
     if [ -n "${backing_img}" ]; then
-        kpartx -v -d "${backing_img}"
+        # sync before removing loop to avoid "Device or resource busy" errors
+        sync
+        kpartx_ret=""
+        kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
+        echo "$kpartx_stdout"
+        if [ -n "$kpartx_ret" ]; then
+            if echo "$kpartx_stdout" | grep -q "loop deleted"; then
+                echo "Suppressing kpartx returning error (#860894)"
+            else
+                exit $kpartx_ret
+            fi
+        fi
         unset backing_img
     fi
 
@@ -69,8 +82,7 @@ mount_image() {
 setup_mountpoint() {
     local mountpoint="$1"
 
-    mount --bind /dev "$mountpoint/dev"
-    mount devpts-live -t proc "$mountpoint/dev/pts"
+    mount --rbind /dev "$mountpoint/dev"
     mount proc-live -t proc "$mountpoint/proc"
     mount sysfs-live -t sysfs "$mountpoint/sys"
     mount -t tmpfs none "$mountpoint/tmp"
@@ -79,6 +91,21 @@ setup_mountpoint() {
 
 }
 
+teardown_mountpoint() {
+    # Reverse the operations from setup_mountpoint
+    local mountpoint="$1"
+
+    umount "$mountpoint/tmp"
+    umount "$mountpoint/sys"
+    umount "$mountpoint/proc"
+    umount -R "$mountpoint/dev"
+
+    apt-get install -qqy udev
+    udevadm settle
+    sleep 3
+    mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
+}
+
 mount_partition() {
     partition="$1"
     mountpoint="$2"
@@ -122,20 +149,10 @@ EOF
 
 }
 
-umount_settle() {
-    # Unmount device, and let it settle
-    umount $1
-    udevadm settle
-}
-
 umount_partition() {
     local mountpoint=${1}
-    mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
-    for submnt in proc sys dev/pts dev tmp;
-    do
-        umount $mountpoint/$submnt
-    done
-    umount $mountpoint
+    teardown_mountpoint $mountpoint
+    umount -R $mountpoint
     udevadm settle
 
     if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then

live-build/ubuntu-cpc/hooks/032-root-squashfs.binary

@@ -36,12 +36,7 @@ chroot binary/boot/squashfs.dir mkdir /lib/modules
 chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe
 chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe
 
-mv resolv.conf.tmp "binary/boot/squashfs.dir/etc/resolv.conf"
-umount "binary/boot/squashfs.dir/proc"
-umount "binary/boot/squashfs.dir/sys"
-umount "binary/boot/squashfs.dir/dev/pts"
-umount "binary/boot/squashfs.dir/dev"
-umount "binary/boot/squashfs.dir/tmp"
+teardown_mountpoint binary/boot/squashfs.dir
 
 apt-get -qqy install squashfs-tools
 

live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary

@@ -118,6 +118,7 @@ EOF
     sync
     umount mountpoint/boot/efi
     sleep 5
+    apt-get install -qqy udev
     udevadm settle
     mount
     umount_partition mountpoint

live-build/ubuntu-cpc/hooks/999-extras.binary

@@ -13,4 +13,4 @@ export CLOUD_IMG_STR="$IMAGE_STR"
 export FS_LABEL="cloudimg-rootfs"
 
 # Cleaner execution
-/bin/run-parts --regex ".*\.binary" "${extra_d}"
+/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"

live-build/ubuntu-server/hooks/032-installer-squashfs.binary

@@ -28,11 +28,11 @@ OVERLAY_ROOT=binary/boot/overlay.dir
 
 mkdir -p "$OVERLAY_ROOT"
 
-setup_mountpoint binary/boot/squashfs.dir
-
 # Create an installer squashfs layer
 mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
 
+setup_mountpoint binary/boot/squashfs.dir
+
 # Prepare installer layer.
 
 # Install any requirements for the installer, for things we don't want
@@ -147,18 +147,11 @@ AAHP0AEiHQ7zN0yLl7+fkYIMy64xQJqamH1Z2BFN0GWMPwTjpXpszOC+ev7Bpbg0xoldQ1tBHHxH
 J4Weia71DnXOnt8cj1VhebVMlyv7B/TGAbGwgprgmQ==
 EOF
 
-mv resolv.conf.tmp "binary/boot/squashfs.dir/etc/resolv.conf"
+teardown_mountpoint "$SQUASH_ROOT"
 
-# Unmount the overlay first, where it is mounted:
+# Then unmount the overlay
 umount "$SQUASH_ROOT"
 
-# Then we can start unmounting the "real" root:
-umount "binary/boot/squashfs.dir/proc"
-umount "binary/boot/squashfs.dir/sys"
-umount "binary/boot/squashfs.dir/dev/pts"
-umount "binary/boot/squashfs.dir/dev"
-umount "binary/boot/squashfs.dir/tmp"
-
 apt-get -qqy install squashfs-tools
 
 squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"