[PR PATCH] runit-void: fix issue with fsck on mounted partitions

[PR PATCH] runit-void: fix issue with fsck on mounted partitions

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages blkdev-write-mounted
https://github.com/void-linux/void-packages/pull/50192

runit-void: fix issue with fsck on mounted partitions
see #50124

backport of https://github.com/void-linux/void-runit/pull/115

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

@dkwo can you test this?


A patch file from https://github.com/void-linux/void-packages/pull/50192.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blkdev-write-mounted-50192.patch --]
[-- Type: text/x-diff, Size: 721 bytes --]

From 76c5b796f66285d632f8e2deedc209bf7a276702 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 4 May 2024 16:17:01 -0400
Subject: [PATCH] runit-void: fix issue with fsck on mounted partitions

---
 srcpkgs/runit-void/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 <gottox@voidlinux.org>"

Re: [PR PATCH] [Updated] runit-void: fix issue with fsck on mounted partitions

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages blkdev-write-mounted
https://github.com/void-linux/void-packages/pull/50192

runit-void: fix issue with fsck on mounted partitions
see #50124

backport of https://github.com/void-linux/void-runit/pull/115

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

@dkwo can you test this?


A patch file from https://github.com/void-linux/void-packages/pull/50192.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blkdev-write-mounted-50192.patch --]
[-- Type: text/x-diff, Size: 2760 bytes --]

From 5dcfefe561a0afc414cfe80d9a668a800ce0811d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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        | 46 +++++++++++++++++++
 srcpkgs/runit-void/template                   |  2 +-
 2 files changed, 47 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..3e39a1df25849f
--- /dev/null
+++ b/srcpkgs/runit-void/patches/blkdev-write-mounted.patch
@@ -0,0 +1,46 @@
+From 7bc7d92ea6c9387b76e98099d51515b1b83493ed Mon Sep 17 00:00:00 2001
+From: classabbyamp <void@placeviolette.net>
+Date: Sat, 4 May 2024 15:50:38 -0400
+Subject: [PATCH] core-services/03-filesystems.sh: don't fsck mounted
+ filesystems
+
+gate this behind linux>=6.8 and the relevant cmdline argument
+
+see also: void-linux/void-packages#50124
+---
+ core-services/03-filesystems.sh | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh
+index bb7eac0..a6dbec4 100644
+--- a/core-services/03-filesystems.sh
++++ b/core-services/03-filesystems.sh
+@@ -56,18 +56,27 @@ if [ -x /usr/bin/zpool -a -x /usr/bin/zfs ]; then
+     # anybody is doing that, so we aren't supporting it for now.
+ fi
+ 
++# linux>=6.8 probably has BLK_DEV_WRITE_MOUNTED enabled,
++# which breaks fsck of mounted partitions, unless bdev_allow_write_mounted
++# is in the cmdline (see below)
++xbps-uhelper pkgmatch "linux-$(uname -r)" "linux>=6.8.0_1" >/dev/null 2>&1
++if [ $? -eq 1 ]; then
++    NOMOUNTED="-M"
++fi
++
+ [ -f /fastboot ] && FASTBOOT=1
+ [ -f /forcefsck ] && FORCEFSCK="-f"
+ for arg in $(cat /proc/cmdline); do
+     case $arg in
+         fastboot) FASTBOOT=1;;
+         forcefsck) FORCEFSCK="-f";;
++        bdev_allow_write_mounted*) NOMOUNTED="";;
+     esac
+ done
+ 
+ if [ -z "$FASTBOOT" ]; then
+     msg "Checking filesystems:"
+-    fsck -A -T -a -t noopts=_netdev $FORCEFSCK
++    fsck -A -T -a -t noopts=_netdev $FORCEFSCK $NOMOUNTED
+     if [ $? -gt 1 ]; then
+         emergency_shell
+     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 <gottox@voidlinux.org>"

Re: [PR PATCH] [Updated] runit-void: fix issue with fsck on mounted partitions

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages blkdev-write-mounted
https://github.com/void-linux/void-packages/pull/50192

runit-void: fix issue with fsck on mounted partitions
see #50124

backport of https://github.com/void-linux/void-runit/pull/115

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

@dkwo can you test this?


A patch file from https://github.com/void-linux/void-packages/pull/50192.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blkdev-write-mounted-50192.patch --]
[-- Type: text/x-diff, Size: 2768 bytes --]

From accb708c6068c174212ae9f24369d5c273e7cb51 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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        | 46 +++++++++++++++++++
 srcpkgs/runit-void/template                   |  2 +-
 2 files changed, 47 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..afc8212516779a
--- /dev/null
+++ b/srcpkgs/runit-void/patches/blkdev-write-mounted.patch
@@ -0,0 +1,46 @@
+From 7bc7d92ea6c9387b76e98099d51515b1b83493ed Mon Sep 17 00:00:00 2001
+From: classabbyamp <void@placeviolette.net>
+Date: Sat, 4 May 2024 15:50:38 -0400
+Subject: [PATCH] core-services/03-filesystems.sh: don't fsck mounted
+ filesystems
+
+gate this behind linux>=6.8 and the relevant cmdline argument
+
+see also: void-linux/void-packages#50124
+---
+ core-services/03-filesystems.sh | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh
+index bb7eac0..a6dbec4 100644
+--- a/core-services/03-filesystems.sh
++++ b/core-services/03-filesystems.sh
+@@ -56,18 +56,27 @@ if [ -x /usr/bin/zpool -a -x /usr/bin/zfs ]; then
+     # anybody is doing that, so we aren't supporting it for now.
+ fi
+ 
++# linux>=6.8 probably has CONFIG_BLK_DEV_WRITE_MOUNTED disabled,
++# which breaks fsck of mounted partitions, unless bdev_allow_write_mounted
++# is in the cmdline (see below)
++xbps-uhelper pkgmatch "linux-$(uname -r)" "linux>=6.8.0_1" >/dev/null 2>&1
++if [ $? -eq 1 ]; then
++    NOMOUNTED="-M"
++fi
++
+ [ -f /fastboot ] && FASTBOOT=1
+ [ -f /forcefsck ] && FORCEFSCK="-f"
+ for arg in $(cat /proc/cmdline); do
+     case $arg in
+         fastboot) FASTBOOT=1;;
+         forcefsck) FORCEFSCK="-f";;
++        bdev_allow_write_mounted*) NOMOUNTED="";;
+     esac
+ done
+ 
+ if [ -z "$FASTBOOT" ]; then
+     msg "Checking filesystems:"
+-    fsck -A -T -a -t noopts=_netdev $FORCEFSCK
++    fsck -A -T -a -t noopts=_netdev $FORCEFSCK $NOMOUNTED
+     if [ $? -gt 1 ]; then
+         emergency_shell
+     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 <gottox@voidlinux.org>"

Re: [PR PATCH] [Updated] runit-void: fix issue with fsck on mounted partitions

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages blkdev-write-mounted
https://github.com/void-linux/void-packages/pull/50192

runit-void: fix issue with fsck on mounted partitions
see #50124

backport of https://github.com/void-linux/void-runit/pull/115

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

@dkwo can you test this?


A patch file from https://github.com/void-linux/void-packages/pull/50192.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blkdev-write-mounted-50192.patch --]
[-- Type: text/x-diff, Size: 2732 bytes --]

From fd2a6b88f135271a65062b45db2bb69736d17462 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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        | 44 +++++++++++++++++++
 srcpkgs/runit-void/template                   |  2 +-
 2 files changed, 45 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..564ed42d189d47
--- /dev/null
+++ b/srcpkgs/runit-void/patches/blkdev-write-mounted.patch
@@ -0,0 +1,44 @@
+From b54ab39243ebba0820e3a5001733487fc137ece7 Mon Sep 17 00:00:00 2001
+From: classabbyamp <void@placeviolette.net>
+Date: Sat, 4 May 2024 15:50:38 -0400
+Subject: [PATCH] core-services/03-filesystems.sh: fsck mounted filesystems
+ separately
+
+see also: void-linux/void-packages#50124
+---
+ core-services/03-filesystems.sh | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh
+index bb7eac0..a246a49 100644
+--- a/core-services/03-filesystems.sh
++++ b/core-services/03-filesystems.sh
+@@ -67,7 +67,27 @@ done
+ 
+ if [ -z "$FASTBOOT" ]; then
+     msg "Checking filesystems:"
+-    fsck -A -T -a -t noopts=_netdev $FORCEFSCK
++    # check rootfs first
++    fsck -T -a $FORCEFSCK /
++    ret="$?"
++    # exit code of 8 indicates "operational error",
++    # which can happen if CONFIG_BLK_DEV_WRITE_MOUNTED
++    # is disabled on linux>=6.8
++    if [ "$ret" -ne 0 ] && [ "$ret" -ne 8 ]; then
++        emergency_shell
++    fi
++    # then check any mounted partitions
++    while read -r part mntpt rest; do
++        if [ "${part#/dev}" != "$part" ] && [ "$mntpt" != "/" ]; then
++            fsck -T -a $FORCEFSCK "$mntpt"
++            ret="$?"
++            if [ "$ret" -ne 0 ] && [ "$ret" -ne 8 ]; then
++                emergency_shell
++            fi
++        fi
++    done </etc/mtab
++    # finally, everything unmounted in fstab
++    fsck -M -A -T -a -t noopts=_netdev $FORCEFSCK
+     if [ $? -gt 1 ]; then
+         emergency_shell
+     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 <gottox@voidlinux.org>"

Re: [PR PATCH] [Updated] runit-void: fix issue with fsck on mounted partitions

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages blkdev-write-mounted
https://github.com/void-linux/void-packages/pull/50192

runit-void: fix issue with fsck on mounted partitions
see #50124

backport of https://github.com/void-linux/void-runit/pull/115

#### Testing the changes
- I tested the changes in this PR: **YES**

@dkwo can you test this?


A patch file from https://github.com/void-linux/void-packages/pull/50192.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blkdev-write-mounted-50192.patch --]
[-- Type: text/x-diff, Size: 2133 bytes --]

From e5be7a93d41ae7009468b6d6d39b70f11979a818 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 <void@placeviolette.net>
+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 <gottox@voidlinux.org>"

Re: runit-void: fix issue with fsck on mounted partitions

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50192#issuecomment-2094836728

Comment:
With `bdev_allow_write_mounted=true`, the behavior is as before.
Without it, it prints the same message
```
fsck.ext4: Device or resource busy while trying to open /dev/mapper/cryptroot-root
Filesystem mounted or opened exclusively by another program?
```
and then it continues (without fsck-ing other partitions like /boot).
So this seems to work as expected in my simple setup.

Re: runit-void: fix issue with fsck on mounted partitions

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50192#issuecomment-2094837634

Comment:
I wonder if this fsck checks should rather run in the initramfs, before mounting anything.

Re: runit-void: fix issue with fsck on mounted partitions

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/50192#issuecomment-2094857073

Comment:
with mkinitcpio, fsck is run in the initramfs, idk about dracut

Re: [PR PATCH] [Merged]: runit-void: fix issue with fsck on mounted partitions

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

There's a merged pull request on the void-packages repository

runit-void: fix issue with fsck on mounted partitions
https://github.com/void-linux/void-packages/pull/50192

Description:
see #50124

backport of https://github.com/void-linux/void-runit/pull/115

#### Testing the changes
- I tested the changes in this PR: **YES**

@dkwo can you test this?