From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 30 Dec 2022 17:00:57 +0000 (+0000)
Subject: dracut: Drop network package & some more modules
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2da3dffc79f172aae3a5b3679556dfbf5fb3643;p=ipfire-3.x.git

dracut: Drop network package & some more modules

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 2088cbf47..a23e46b2d 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -5,7 +5,7 @@
 
 name       = dracut
 version    = 048
-release    = 5
+release    = 6
 
 groups     = System/Boot
 url        = http://sourceforge.net/apps/trac/dracut/wiki
@@ -45,6 +45,24 @@ build
 		mandir=%{mandir}
 
 	install_cmds
+		# Remove unneeded/unsupported modules
+		rm -rfv \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/00dash \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/00systemd-network-management \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/01fips \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/05busybox \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/35network-* \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/40network \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/45url-lib \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/45ifcfg \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/50gensplash \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/62bluetooth \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/95fcoe* \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/95iscsi \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/95nbd \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/95nfs \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/95znet
+
 		# Install local configuration
 		mkdir -pv %{BUILDROOT}/etc/dracut.conf.d
 		cp -vf %{DIR_SOURCE}/ipfire.conf %{BUILDROOT}/etc/dracut.conf.d/ipfire.conf
@@ -54,9 +72,6 @@ build
 		echo "DRACUT_VERSION=%{version}-%{release}" > \
 			%{BUILDROOT}/%{dracutlibdir}/dracut/dracut-version.sh
 
-		# Remove Gentoo specific module
-		rm -rvf %{BUILDROOT}%{dracutlibdir}/modules.d/50gensplash
-
 		mkdir -pv %{BUILDROOT}/boot/dracut
 		mkdir -pv %{BUILDROOT}/var/lib/dracut/overlay
 		mkdir -pv %{BUILDROOT}/var/lib/initramfs
@@ -94,42 +109,6 @@ packages
 		end
 	end
 
-	package %{name}-network
-		summary = Network support for the initramdisk.
-		description
-			This package requires everything which is needed to build a generic
-			all purpose initramfs with network support with dracut.
-		end
-
-		requires
-			dhclient
-			iproute2
-			nfs-utils
-		end
-
-		files
-			/usr/lib/dracut/modules.d/40network
-			/usr/lib/dracut/modules.d/95fcoe
-			/usr/lib/dracut/modules.d/95iscsi
-			/usr/lib/dracut/modules.d/95nbd
-			/usr/lib/dracut/modules.d/95nfs
-			/usr/lib/dracut/modules.d/45ifcfg
-			/usr/lib/dracut/modules.d/95znet
-		end
-	end
-
-	package %{name}-utils
-		summary = Command line utils for dracut.
-		description = %{summary}
-
-		files
-			/boot/dracut
-			/usr/bin/dracut-*
-			/usr/share/man/man8/dracut-*
-			/var/lib/dracut
-		end
-	end
-
 	package %{name}-debuginfo
 		template DEBUGINFO
 	end