Update runit-cereus to 2023.11.24

This commit is contained in:
Kevin Figueroa 2024-06-22 23:37:00 -04:00
parent fa995f0f86
commit 0eb7876e15
2 changed files with 61 additions and 2 deletions

View file

@ -0,0 +1,59 @@
From 4f745732b8b56a54dd2ce87157c00d44255eda3b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 2 Jun 2024 06:31:30 -0400
Subject: [PATCH] core-services, shutdown.d: force legacy mount iface for
remount
With util-linux>=2.40, filesystems that do not support remounting with
different options fail because the new kernel mount interface is used.
This breaks booting an overlayfs (like live ISOs).
By setting `LIBMOUNT_FORCE_MOUNT2=always`, we force `mount(8)` to use
the old kernel mount interface, which ignores changed options.
see also:
* https://github.com/util-linux/util-linux/issues/2576
* https://github.com/void-linux/void-mklive/issues/369
---
core-services/03-filesystems.sh | 4 ++--
shutdown.d/80-filesystems.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh
index bb7eac0..6035cad 100644
--- a/core-services/03-filesystems.sh
+++ b/core-services/03-filesystems.sh
@@ -3,7 +3,7 @@
[ -n "$VIRTUALIZATION" ] && return 0
msg "Remounting rootfs read-only..."
-mount -o remount,ro / || emergency_shell
+LIBMOUNT_FORCE_MOUNT2=always mount -o remount,ro / || emergency_shell
if [ -x /sbin/dmraid -o -x /bin/dmraid ]; then
msg "Activating dmraid devices..."
@@ -74,7 +74,7 @@ if [ -z "$FASTBOOT" ]; then
fi
msg "Mounting rootfs read-write..."
-mount -o remount,rw / || emergency_shell
+LIBMOUNT_FORCE_MOUNT2=always mount -o remount,rw / || emergency_shell
msg "Mounting all non-network filesystems..."
mount -a -t "nosysfs,nonfs,nonfs4,nosmbfs,nocifs" -O no_netdev || emergency_shell
diff --git a/shutdown.d/80-filesystems.sh b/shutdown.d/80-filesystems.sh
index 95dcce4..7a83de3 100644
--- a/shutdown.d/80-filesystems.sh
+++ b/shutdown.d/80-filesystems.sh
@@ -3,7 +3,7 @@ if [ -z "$VIRTUALIZATION" ]; then
swapoff -a
umount -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs
msg "Remounting rootfs read-only..."
- mount -o remount,ro /
+ LIBMOUNT_FORCE_MOUNT2=always mount -o remount,ro /
fi
sync
--
2.45.1

View file

@ -1,6 +1,6 @@
# Template file for 'runit-cereus'
pkgname=runit-cereus
version=2023.04.13
version=2023.11.24
_version=${version//./}
revision=1
repository=cereus-core
@ -12,7 +12,7 @@ license="CC0-1.0"
conflicts="runit-void"
homepage="https://github.com/void-linux/void-runit"
distfiles="https://github.com/void-linux/void-runit/archive/${_version}.tar.gz"
checksum=1049555eb27c370ec482ab576382ff951c2c33da6e8f5d165b3733c4a6d157cb
checksum=2bdb86a08ee0ee70d1a189ebbf9e60157f847e8c8f75caedc009536ca794a77c
depends="virtual?awk procps-ng runit"
conf_files="