commit: d16cdc9c9eb5826a704dc71fd6838a24d83a1172 Author: Laszlo Gombos <laszlo.gombos <AT> gmail <DOT> com> AuthorDate: Sat Dec 24 02:02:14 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Dec 25 02:53:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16cdc9c
sys-kernel/dracut: when no systemd then only network-legacy is supported Bug: https://github.com/dracutdevs/dracut/issues/1756 Signed-off-by: Laszlo Gombos <laszlo.gombos <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/28777 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-kernel/dracut/dracut-057-r2.ebuild | 1 + sys-kernel/dracut/dracut-9999.ebuild | 1 + sys-kernel/dracut/files/gentoo-network-r1.patch | 29 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/sys-kernel/dracut/dracut-057-r2.ebuild b/sys-kernel/dracut/dracut-057-r2.ebuild index 5a6ec27fcb43..ddb9e967acd8 100644 --- a/sys-kernel/dracut/dracut-057-r2.ebuild +++ b/sys-kernel/dracut/dracut-057-r2.ebuild @@ -63,6 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch + "${FILESDIR}"/gentoo-network-r1.patch "${FILESDIR}"/057-virtiofs-split-usr.patch "${FILESDIR}"/057-i18n-keymaps.patch ) diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 7f2f0151787d..40d636fee825 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -63,6 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch + "${FILESDIR}"/gentoo-network-r1.patch ) src_configure() { diff --git a/sys-kernel/dracut/files/gentoo-network-r1.patch b/sys-kernel/dracut/files/gentoo-network-r1.patch new file mode 100644 index 000000000000..3d5db25cb0ae --- /dev/null +++ b/sys-kernel/dracut/files/gentoo-network-r1.patch @@ -0,0 +1,29 @@ +From 5443396f3cb591f2589888b25e07f21f03989057 Mon Sep 17 00:00:00 2001 +From: Laszlo Gombos <[email protected]> +Date: Sat, 24 Dec 2022 01:48:04 +0000 +Subject: [PATCH] When no systemd then only network-legacy is supported + +Bug: https://github.com/dracutdevs/dracut/issues/1756 +--- + modules.d/40network/module-setup.sh | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh +index 1ab13ef..da49947 100755 +--- a/modules.d/40network/module-setup.sh ++++ b/modules.d/40network/module-setup.sh +@@ -16,6 +16,11 @@ depends() { + fi + done + ++ # When systemd is not available only network-legacy is supported ++ if [ -z "$network_handler" ] && ! find_binary systemctl > /dev/null; then ++ network_handler="network-legacy" ++ fi ++ + if [ -z "$network_handler" ]; then + if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then + network_handler="network-wicked" +-- +2.34.1 +
