From 5d9a2596be0d9cdd624985087e78617f89f67292 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 11 May 2024 21:39:39 -0400 Subject: [PATCH] Revert "runit-void: fix issue with fsck on mounted partitions" This reverts commit 92a5a8405304a336a9d3e72d45c576d19a72da43. This reverts commit 5b8e9b7443da0ed73437ff64e48be2f80f4b90f4. --- .../patches/blkdev-write-mounted.patch | 27 ------------------- srcpkgs/runit-void/template | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) delete 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 deleted file mode 100644 index 89fd44a33c3..00000000000 --- a/srcpkgs/runit-void/patches/blkdev-write-mounted.patch +++ /dev/null @@ -1,27 +0,0 @@ -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" -gt 1 ] && [ "$ret" -ne 8 ]; then - emergency_shell - fi - fi diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index 9994f3235fb..1858738a881 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=3 +revision=4 build_style=gnu-makefile short_desc="Void Linux runit scripts" maintainer="Enno Boland "