commit: ea72d909cb0b44f958dad051494396fc0154983d Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Nov 9 16:09:02 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Nov 9 16:09:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea72d909
sys-kernel/dracut: backport dmsquash-live fix Closes: https://bugs.gentoo.org/917069 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../{dracut-059-r4.ebuild => dracut-059-r5.ebuild} | 1 + .../dracut/files/dracut-059-dmsquash-live.patch | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/sys-kernel/dracut/dracut-059-r4.ebuild b/sys-kernel/dracut/dracut-059-r5.ebuild similarity index 98% rename from sys-kernel/dracut/dracut-059-r4.ebuild rename to sys-kernel/dracut/dracut-059-r5.ebuild index 444537fc6276..2ca8c742b3cb 100644 --- a/sys-kernel/dracut/dracut-059-r4.ebuild +++ b/sys-kernel/dracut/dracut-059-r5.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}"/059-uefi-split-usr.patch "${FILESDIR}"/059-uki-systemd-254.patch "${FILESDIR}"/059-gawk.patch + "${FILESDIR}"/dracut-059-dmsquash-live.patch ) src_configure() { diff --git a/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch b/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch new file mode 100644 index 000000000000..8061d686788b --- /dev/null +++ b/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch @@ -0,0 +1,26 @@ +From 19e4839ab70a691f95a0284aa0152a247eb5c63d Mon Sep 17 00:00:00 2001 +From: Laszlo Gombos <laszlo.gom...@gmail.com> +Date: Fri, 24 Feb 2023 01:57:19 +0000 +Subject: [PATCH] fix(dmsquash-live): restore compatibility with earlier + releases + +Follow-up to 40dd5c90e0efcb9ebaa9abb42a38c7316e9706bd . +--- + modules.d/90dmsquash-live/dmsquash-live-root.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh +index 62d1b5e7cd..a98e258c26 100755 +--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh ++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh +@@ -403,6 +403,10 @@ fi + + ROOTFLAGS="$(getarg rootflags)" + ++if [ "$overlayfs" = required ]; then ++ echo "rd.live.overlay.overlayfs=1" > /etc/cmdline.d/dmsquash-need-overlay.conf ++fi ++ + if [ -n "$overlayfs" ]; then + if [ -n "$FSIMG" ]; then + mkdir -m 0755 -p /run/rootfsbase
