Re: [PR PATCH] [Updated] dracut: move network-legacy into dracut-network package

[LaszloGombos <LaszloGombos@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 771 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41031

dracut: move network-legacy into dracut-network package
Other changes:
 - remove more systemd dependent modules
 - network-manager module depends on the dbus dracut module, which in turn depends on the systemd dracut module

#### Testing the changes
- I tested the changes in this PR: **NO**

In case it helps to test and review - alpine dracut package has some similar changes - https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/dracut/APKBUILD#L35

A patch file from https://github.com/void-linux/void-packages/pull/41031.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41031.patch --]
[-- Type: text/x-diff, Size: 3294 bytes --]

From 1210aa243036a0ddde9946921c37af46dbcf26c6 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Mon, 12 Dec 2022 05:17:53 +0000
Subject: [PATCH 1/2] dracut: move network-legacy into dracut-network package

Other changes:
 - remove more systemd dependent modules
 - network-manager module depends on the dbus dracut module,
 which in turn depends on the systemd dracut module
---
 srcpkgs/dracut/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 001a4c52c023..bdc5cf2ef560 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -2,7 +2,7 @@
 pkgname=dracut
 reverts="056_1"
 version=053
-revision=5
+revision=6
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -44,6 +44,14 @@ post_install() {
 
 	# We don't need the systemd stuff.
 	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
+
+	# systemd dependent additional dracut modules
+	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*bluetooth
+	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*connman
+	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*dbus*
+	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-manager
+	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-wicked
+
 	rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -rf ${DESTDIR}/usr/lib/kernel
 }
@@ -52,7 +60,7 @@ dracut-network_package() {
 	depends="dhclient ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - network modules"
 	pkg_install() {
-		for f in 40network 90livenet 95fcoe 95iscsi \
+		for f in 35network-legacy 40network 90livenet 95fcoe 95iscsi \
 			95nbd 95nfs 95zfcp 95znet; do
 			vmove usr/lib/dracut/modules.d/${f}
 		done

From 4e54b655e004da64ccef2a3699f8d20a22f3ec86 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Tue, 13 Dec 2022 15:10:21 -0500
Subject: [PATCH 2/2] Update srcpkgs/dracut/template

Co-authored-by: Michal Vasilek <michal@vasilek.cz>
---
 srcpkgs/dracut/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index bdc5cf2ef560..3075edd34aed 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -43,17 +43,16 @@ post_install() {
 	vinstall ${FILESDIR}/kernel-hook-postrm 755 usr/libexec/dracut
 
 	# We don't need the systemd stuff.
-	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
+	rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
 
 	# systemd dependent additional dracut modules
-	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*bluetooth
-	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*connman
-	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*dbus*
-	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-manager
-	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-wicked
+	rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*connman
+	rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*dbus*
+	rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*network-manager
+	rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*network-wicked
 
-	rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
-	rm -rf ${DESTDIR}/usr/lib/kernel
+	rm ${DESTDIR}/usr/share/man/man8/*.service.*
+	rm -r ${DESTDIR}/usr/lib/kernel
 }
 
 dracut-network_package() {