[neon/neon/livecd-rootfs/Neon/release-lts] live-build: Perform fsck on all rootfs.
Dimitri John Ledkov
null at kde.org
Fri Mar 12 10:45:26 GMT 2021
Git commit e1bea4d00e8a5cb87a0f0cad628b57f0c97d5053 by Dimitri John Ledkov.
Committed on 09/02/2021 at 00:50.
Pushed by jriddell into branch 'Neon/release-lts'.
Perform fsck on all rootfs.
LP: #1912835
(cherry picked from commit 33b7272a2331279b4c7aa8de73ed8a9069d0bd39)
M +1 -1 live-build/buildd/hooks/02-disk-image-uefi.binary
M +1 -1 live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
M +1 -1 live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
M +1 -1 live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
https://invent.kde.org/neon/neon/livecd-rootfs/commit/e1bea4d00e8a5cb87a0f0cad628b57f0c97d5053
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
More information about the Neon-commits
mailing list