From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] runit-void: fix issue with fsck on mounted partitions
Date: Sat, 04 May 2024 22:21:32 +0200 [thread overview]
Message-ID: <20240504202132.1799C22222@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50192@inbox.vuxu.org>
[-- 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>"
next prev parent reply other threads:[~2024-05-04 20:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 20:18 [PR PATCH] " classabbyamp
2024-05-04 20:18 ` [PR PATCH] [Updated] " classabbyamp
2024-05-04 20:21 ` classabbyamp [this message]
2024-05-05 12:26 ` classabbyamp
2024-05-05 14:19 ` classabbyamp
2024-05-05 14:44 ` dkwo
2024-05-05 14:46 ` dkwo
2024-05-05 15:48 ` classabbyamp
2024-05-05 16:04 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240504202132.1799C22222@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).