Merge lp:~cjwatson/livecd-rootfs/recursive-mount-dev into lp:livecd-rootfs

[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).

This also fixes the oddity whereby setup_mountpoint mounted $mountpoint/dev/pts with -t proc.

[Dimitri John Ledkov (xnox)]

note to self: -R is not available in trusty's umount, thus if we need this back in trusty too something else should be done, or umount backported at least in the cpc PPAs.

review: Approve

[Steve Langasek (vorlon)]

I will go ahead with merging this for artful/zesty/xenial as-is, notwithstanding Dimitri's above comment, because fixing this in trusty is not critical-path for any of our cloud images and I'm comfortable with us solving this differently (more complicated) as a trusty-only change later.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-09-01 16:54:50 +0000
+++ debian/changelog	2017-09-08 10:50:00 +0000
@@ -3,6 +3,11 @@
   [ Chris Glass ]
   * Create vagrant user for vagrant image, per upstream requirements.
 
+  [ 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).
+
  -- Adam Conrad <[e-mail]>  Fri, 01 Sep 2017 10:53:46 -0600
 
 livecd-rootfs (2.452) artful; urgency=medium

=== modified file 'live-build/functions'
--- live-build/functions	2017-08-30 14:46:47 +0000
+++ live-build/functions	2017-09-08 10:50:00 +0000
@@ -79,8 +79,7 @@
 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"
@@ -141,11 +140,7 @@
 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
+    umount -R $mountpoint
     udevadm settle
 
     if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then

=== modified file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary'
--- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2017-06-14 16:25:11 +0000
+++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2017-09-08 10:50:00 +0000
@@ -39,8 +39,7 @@
 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 -R "binary/boot/squashfs.dir/dev"
 umount "binary/boot/squashfs.dir/tmp"
 
 squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"

=== modified file 'live-build/ubuntu-server/hooks/032-installer-squashfs.binary'
--- live-build/ubuntu-server/hooks/032-installer-squashfs.binary	2017-06-14 16:25:11 +0000
+++ live-build/ubuntu-server/hooks/032-installer-squashfs.binary	2017-09-08 10:50:00 +0000
@@ -155,8 +155,7 @@
 # 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 -R "binary/boot/squashfs.dir/dev"
 umount "binary/boot/squashfs.dir/tmp"
 
 squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"