From e51391786277ba718b5c6d5dba22bdec9a0812b8 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Wed, 13 Sep 2017 12:13:08 -0700
Subject: [PATCH] Also adjust
 live-build/ubuntu-server/hooks/032-installer-squashfs.binary to use
 teardown_mountpoint.

---
 debian/changelog                                   |  4 ++++
 .../hooks/032-installer-squashfs.binary            | 14 ++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c63fba55..da79e593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ livecd-rootfs (2.441.6) UNRELEASED; urgency=medium
   * 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.
+
  -- Robert C Jennings <robert.jennings@canonical.com>  Wed, 13 Sep 2017 13:36:40 -0500
 
 livecd-rootfs (2.441.5) zesty; urgency=medium
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index 0773901f..0f2e424a 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/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,17 +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 -R "binary/boot/squashfs.dir/dev"
-umount "binary/boot/squashfs.dir/tmp"
-
 apt-get -qqy install squashfs-tools
 
 squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"