From bfe2e92e708e97daa4ce68d992767cb345b048c8 Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Mon, 12 Dec 2022 05:17:53 +0000 Subject: [PATCH] dracut: add network-legacy to dracut-network 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 | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 001a4c52c023..3075edd34aed 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" @@ -43,16 +43,23 @@ 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 -f ${DESTDIR}/usr/share/man/man8/*.service.* - rm -rf ${DESTDIR}/usr/lib/kernel + rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*systemd* + + # systemd dependent additional dracut modules + 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 ${DESTDIR}/usr/share/man/man8/*.service.* + rm -r ${DESTDIR}/usr/lib/kernel } 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