From e5be7a93d41ae7009468b6d6d39b70f11979a818 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 4 May 2024 16:17:01 -0400 Subject: [PATCH] runit-void: fix issue with fsck on mounted partitions --- .../patches/blkdev-write-mounted.patch | 27 +++++++++++++++++++ srcpkgs/runit-void/template | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/runit-void/patches/blkdev-write-mounted.patch diff --git a/srcpkgs/runit-void/patches/blkdev-write-mounted.patch b/srcpkgs/runit-void/patches/blkdev-write-mounted.patch new file mode 100644 index 00000000000000..4dc8f1ca62fca5 --- /dev/null +++ b/srcpkgs/runit-void/patches/blkdev-write-mounted.patch @@ -0,0 +1,27 @@ +From 8abcbe9b4cf7eb49f6e1aacf2ee3a45dae4360ba Mon Sep 17 00:00:00 2001 +From: classabbyamp +Date: Sat, 4 May 2024 15:50:38 -0400 +Subject: [PATCH] core-services/03-filesystems.sh: ignore fsck result of 8 + +exit code of 8 indicates "operational error", which can happen if +CONFIG_BLK_DEV_WRITE_MOUNTED is disabled on linux>=6.8, so ignore it + +see also: void-linux/void-packages#50124 +--- + core-services/03-filesystems.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh +index bb7eac0..546927c 100644 +--- a/core-services/03-filesystems.sh ++++ b/core-services/03-filesystems.sh +@@ -68,7 +68,8 @@ done + if [ -z "$FASTBOOT" ]; then + msg "Checking filesystems:" + fsck -A -T -a -t noopts=_netdev $FORCEFSCK +- if [ $? -gt 1 ]; then ++ ret="$?" ++ if [ "$ret" -ne 0 ] && [ "$ret" -ne 8 ]; then + emergency_shell + fi + fi diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index 66dd4ac88832d3..9b99964752e809 100644 --- a/srcpkgs/runit-void/template +++ b/srcpkgs/runit-void/template @@ -1,7 +1,7 @@ # Template file for 'runit-void' pkgname=runit-void version=20231124 -revision=1 +revision=2 build_style=gnu-makefile short_desc="Void Linux runit scripts" maintainer="Enno Boland "