mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-08 21:56:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-kernel/dracut: Sync with Gentoo

Browse Source 
It's from Gentoo commit f4ff70248eefc2a2b92c7c9ae6527621002a47bf.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2026-04-13 07:43:58 +00:00
parent 7e80041f85
commit 6298539624
5 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/dracut-108-r5.ebuild → sdk_container/src/third_party/portage-stable/sys-kernel/dracut/dracut-108-r6.ebuild vendored
View File

@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
|| (
>=sys-apps/sysvinit-2.87-r3
sys-apps/openrc[sysv-utils(-),selinux?]
sys-apps/systemd[sysv-utils]
sys-apps/systemd[sysv-utils(+)]
sys-apps/s6-linux-init[sysv-utils(-)]
)
>=sys-apps/util-linux-2.21

2
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/dracut-109-r1.ebuild → sdk_container/src/third_party/portage-stable/sys-kernel/dracut/dracut-109-r2.ebuild vendored
View File

@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
|| (
>=sys-apps/sysvinit-2.87-r3
sys-apps/openrc[sysv-utils(-),selinux?]
sys-apps/systemd[sysv-utils]
sys-apps/systemd[sysv-utils(+)]
sys-apps/s6-linux-init[sysv-utils(-)]
)
>=sys-apps/util-linux-2.21

3
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/dracut-110-r2.ebuild → sdk_container/src/third_party/portage-stable/sys-kernel/dracut/dracut-110-r4.ebuild vendored
View File

@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
|| (
>=sys-apps/sysvinit-2.87-r3
sys-apps/openrc[sysv-utils(-),selinux?]
sys-apps/systemd[sysv-utils]
sys-apps/systemd[sysv-utils(+)]
sys-apps/s6-linux-init[sysv-utils(-)]
)
>=sys-apps/util-linux-2.21
@ -106,6 +106,7 @@ PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
# Gentoo specific acct-user and acct-group conf adjustments
"${FILESDIR}"/${PN}-110-acct-user-group-gentoo.patch
"${FILESDIR}"/${P}-dash-printf.patch
)
pkg_setup() {

2
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/dracut-9999.ebuild vendored
View File

@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
|| (
>=sys-apps/sysvinit-2.87-r3
sys-apps/openrc[sysv-utils(-),selinux?]
sys-apps/systemd[sysv-utils]
sys-apps/systemd[sysv-utils(+)]
sys-apps/s6-linux-init[sysv-utils(-)]
)
>=sys-apps/util-linux-2.21

32
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/files/dracut-110-dash-printf.patch vendored Normal file
View File

@ -0,0 +1,32 @@
https://bugs.gentoo.org/971601
https://github.com/dracut-ng/dracut-ng/pull/2303
From eca6d9f1d35879d411f5f860cf5e0a57cd155ad4 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung@canonical.com>
Date: Mon, 16 Mar 2026 11:22:33 +0100
Subject: [PATCH] fix(dracut.sh): use printf instead of echo in mark_hostonly
POSIX requires to interpreted escape sequences. The filenames passed to
`mark_hostonly` might contain backslashes and therefore might be
interpreted (dash 0.5.13.1 will do that).
So use `printf` instead to avoid escaping the filenames.
Fixes: https://github.com/dracut-ng/dracut-ng/issues/2280
---
dracut.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
index 28c8ecc92..cc5ad0b8c 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1559,7 +1559,7 @@ inst_fsck_help() {
# shellcheck disable=SC2317,SC2329
mark_hostonly() {
for i in "$@"; do
- echo "$i" >> "$initdir/lib/dracut/hostonly-files"
+ printf "%s\n" "$i" >> "$initdir/lib/dracut/hostonly-files"
done
}