From 28d11fc3e722f5625e759824a7b7eb34831826c2 Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Thu, 2 Mar 2023 02:46:36 +0000 Subject: [PATCH] dracut: remove ifcfg dracut module Other changes: - remove connman as it depends on systemd - move more network dependent modules to dracut-network package --- srcpkgs/dracut/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 859d7a2c907..436a6e29b15 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -52,7 +52,7 @@ post_install() { # systemd dependent additional dracut modules for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \ - 35network-manager 35network-wicked 80lvmmerge \ + 35connman 35network-manager 35network-wicked 80lvmmerge \ 99memstrack 99squash; do rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f} done @@ -64,6 +64,9 @@ post_install() { rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f} done + # ifcfg network-scripts dependent (RHEL-derived) + rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg + rm ${DESTDIR}/usr/share/man/man8/*.service.* rm -r ${DESTDIR}/usr/lib/kernel } @@ -72,8 +75,9 @@ dracut-network_package() { depends="dhclient ${sourcepkg}-${version}_${revision}" short_desc+=" - network modules" pkg_install() { - for f in 35network-legacy 40network 90livenet \ - 95fcoe 95iscsi 95nbd 95nfs; do + for f in 35network-legacy 40network 45url-lib \ + 90kernel-network-modules 90qemu-net 90livenet \ + 95cifs 95fcoe 95fcoe-uefi 95iscsi 95nbd 95nfs 95ssh-client; do vmove usr/lib/dracut/modules.d/${f} done }