Merge remote-tracking branch 'gjolly/consistent_fstab-focal' into ubuntu/focal

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.664.20) UNRELEASED; urgency=medium
+
+  * ubuntu-cpc: secure esp mountpoint (LP: #1881006)
+    Change mount option for ubuntu-cpc images from "defaults" to "umask=0077"
+    ESP partitions might contain sensitive data and non-root users shouldn't
+    have read access on it.
+
+ -- Gauthier Jolly <gauthier.jolly@canonical.com>  Wed, 17 Mar 2021 16:55:37 +0000
+
 livecd-rootfs (2.664.19) focal; urgency=medium
 
   [ Patrick Viafore ]

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

@@ -94,7 +94,7 @@ create_and_mount_uefi_partition() {
     mount "${uefi_dev}" "$mountpoint"/boot/efi
 
     cat << EOF >> "mountpoint/etc/fstab"
-LABEL=UEFI	/boot/efi	vfat	defaults	0 1
+LABEL=UEFI	/boot/efi	vfat	umask=0077	0 1
 EOF
 }