Merge ~vorlon/ubiquity:right-target-env-for-update-initramfs into ubiquity:main

[Steve Langasek]

Unmerged commits

370a463... by Steve Langasek on 2022-10-18

scripts/zsys-setup: ensure virtfs mounts are present in the target before calling update-initramfs.

diff --git a/debian/changelog b/debian/changelog
index 1c91c63..f93b7fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (22.10.10) UNRELEASED; urgency=medium
+
+  * scripts/zsys-setup: ensure virtfs mounts are present in the target
+    before calling update-initramfs.
+
+ -- Steve Langasek <[e-mail]>  Tue, 18 Oct 2022 11:23:37 -0700
+
 ubiquity (22.10.9) kinetic; urgency=medium
 
   * partman/resize: add a margin to the minimal size for partition shrinking
diff --git a/scripts/zsys-setup b/scripts/zsys-setup
index 78df4f3..9a325f2 100755
--- a/scripts/zsys-setup
+++ b/scripts/zsys-setup
@@ -615,7 +615,13 @@ elif [ "${COMMAND}" = "finalize" ]; then
 	if [ -b /dev/mapper/cryptoswap ]; then
 		mkdir -p "${TARGET}/etc/initramfs-tools/conf.d"
 		echo "RESUME=none" > "${TARGET}/etc/initramfs-tools/conf.d/resume"
+		mount -t proc proc "$TARGET/proc"
+		mount -t sysfs sysfs "$TARGET/sys"
+		mount --bind /run "$TARGET/run"
+		mount --bind /dev/ "$TARGET/dev"
 		chroot "${TARGET}" update-initramfs -u
+		# lazy unmount to increase the chances of success
+		umount -l "$TARGET/proc" "$TARGET/sys" "$TARGET/run" "$TARGET/dev"
 	fi
 
 	echo "I: ZFS setup complete"