From fb21ae4118745a78e8c1fcfecdc35f1be9f61482 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 23 Dec 2022 09:22:56 +0100 Subject: Fix filesystem after creation The VM is not bootable after a dist upgrade, otherwise, see: https://salsa.debian.org/helmutg/debvm/-/merge_requests/8 and when running twice. --- debvm-create | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debvm-create b/debvm-create index 615054a..794ab92 100755 --- a/debvm-create +++ b/debvm-create @@ -178,3 +178,7 @@ mmdebstrap "$@" truncate -s "$SIZE" "$IMAGE" /sbin/resize2fs "$IMAGE" /sbin/tune2fs -L debvm -i 0 -O extents,uninit_bg,dir_index,has_journal "$IMAGE" + +# fix filesystem after tune2fs +/sbin/fsck.ext4 -y rootfs.ext2 +/sbin/fsck.ext4 -y rootfs.ext2 || true -- cgit v1.2.3 From 28a7ddac2f411f804941892b7b1b26244df9b4b2 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 23 Dec 2022 10:07:14 +0100 Subject: debvm-create: improve fsck * Explain why we need this. * Pass recommended options -fD. * As a consequence, running it once is enough. * Don't mask errors. --- debvm-create | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debvm-create b/debvm-create index 794ab92..21d9a15 100755 --- a/debvm-create +++ b/debvm-create @@ -179,6 +179,5 @@ truncate -s "$SIZE" "$IMAGE" /sbin/resize2fs "$IMAGE" /sbin/tune2fs -L debvm -i 0 -O extents,uninit_bg,dir_index,has_journal "$IMAGE" -# fix filesystem after tune2fs -/sbin/fsck.ext4 -y rootfs.ext2 -/sbin/fsck.ext4 -y rootfs.ext2 || true +# Must fsck after tune2fs: https://ext4.wiki.kernel.org/index.php/UpgradeToExt4 +/sbin/fsck.ext4 -fD rootfs.ext2 -- cgit v1.2.3 From 150560697e4070be6c98a4b435bb343e743152c9 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 23 Dec 2022 10:26:09 +0100 Subject: Fix errors by default --- debvm-create | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debvm-create b/debvm-create index 21d9a15..843bb5f 100755 --- a/debvm-create +++ b/debvm-create @@ -178,6 +178,5 @@ mmdebstrap "$@" truncate -s "$SIZE" "$IMAGE" /sbin/resize2fs "$IMAGE" /sbin/tune2fs -L debvm -i 0 -O extents,uninit_bg,dir_index,has_journal "$IMAGE" - # Must fsck after tune2fs: https://ext4.wiki.kernel.org/index.php/UpgradeToExt4 -/sbin/fsck.ext4 -fD rootfs.ext2 +/sbin/fsck.ext4 -fDy rootfs.ext2 -- cgit v1.2.3 From 6ef68b62dee3dc2b2407db8290c87713b3791965 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 23 Dec 2022 10:38:14 +0100 Subject: Use -p for fsck Reported-by: Helmut Grohne --- debvm-create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debvm-create b/debvm-create index 843bb5f..a1a22d4 100755 --- a/debvm-create +++ b/debvm-create @@ -179,4 +179,4 @@ truncate -s "$SIZE" "$IMAGE" /sbin/resize2fs "$IMAGE" /sbin/tune2fs -L debvm -i 0 -O extents,uninit_bg,dir_index,has_journal "$IMAGE" # Must fsck after tune2fs: https://ext4.wiki.kernel.org/index.php/UpgradeToExt4 -/sbin/fsck.ext4 -fDy rootfs.ext2 +/sbin/fsck.ext4 -fDp rootfs.ext2 -- cgit v1.2.3