From e1bea4d00e8a5cb87a0f0cad628b57f0c97d5053 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 1 Feb 2021 14:45:42 +0000
Subject: [PATCH] Perform fsck on all rootfs.

LP: #1912835
(cherry picked from commit 33b7272a2331279b4c7aa8de73ed8a9069d0bd39)
---
 live-build/buildd/hooks/02-disk-image-uefi.binary           | 2 +-
 live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot | 2 +-
 live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot   | 2 +-
 live-build/ubuntu/hooks/040-hyperv-desktop-images.binary    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary
index 18f74bae..f75e3aa2 100755
--- a/live-build/buildd/hooks/02-disk-image-uefi.binary
+++ b/live-build/buildd/hooks/02-disk-image-uefi.binary
@@ -49,7 +49,7 @@ create_and_mount_uefi_partition() {
     mount "${uefi_dev}" "$mountpoint"/boot/efi
 
     cat << EOF >> "mountpoint/etc/fstab"
-LABEL=UEFI	/boot/efi	vfat	defaults	0 0
+LABEL=UEFI	/boot/efi	vfat	defaults	0 1
 EOF
 }
 
diff --git a/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot b/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
index 461c752f..17c2e931 100755
--- a/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
+++ b/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
@@ -2,5 +2,5 @@
 
 cat >>/etc/fstab<<EOT
 # Minimal setup required for systemd to provide a r/w FS
-/dev/root	/	rootfs	defaults	0	0
+/dev/root	/	rootfs	defaults	0	1
 EOT
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 7817c430..391ae370 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 0
+LABEL=cloudimg-rootfs	/	 ext4	defaults	0 1
 EOM
 
 # for quantal and newer, add /etc/overlayroot.local.conf
diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
index 23697b8e..b27aebd2 100644
--- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
+++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
@@ -48,7 +48,7 @@ hv_sock
 EOF
 
 cat << EOF >> "${scratch_d}/etc/fstab"
-LABEL=$FS_LABEL	/		ext4	defaults	0 0
+LABEL=$FS_LABEL	/		ext4	defaults	0 1
 EOF
 
 # Customise xrdp