From 76330897dca419281ab1be1e659c93bece2d4582 Mon Sep 17 00:00:00 2001 From: Gauthier Jolly Date: Thu, 18 Feb 2021 12:54:32 +0000 Subject: [PATCH] ubuntu-cpc: make /etc/fstab consistent with other ubuntu images Modify the mount options in fstab to make the Cloud images consistent with the default we have elsewhere. LP: #1902103 LP: #1881006 --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66b76a45..2900d4bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.715) hirsute; urgency=medium + + * ubuntu-cpc: change mount options in fstab to be align with defaults + (LP: #1902103, LP: #1881006) + + -- Gauthier Tue, 02 Mar 2021 14:17:39 +0000 + livecd-rootfs (2.714) hirsute; urgency=medium * Suppress cloud-init output during boot of live server ISO. diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 069ccd9d..b9745db6 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/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 } diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot index 391ae370..3e1a9131 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot @@ -72,7 +72,7 @@ if [ -n "${root_fs_label}" ]; then sed -i "s,^[^#${bl}]*\([${bl}]*/[${bl}].*\),${lstr}\1," "${rootd}/etc/fstab" fi cat > /etc/fstab << EOM -LABEL=cloudimg-rootfs / ext4 defaults 0 1 +LABEL=cloudimg-rootfs / ext4 discard,errors=remount-ro 0 1 EOM # for quantal and newer, add /etc/overlayroot.local.conf