From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Thu, 6 Nov 2025 12:28:38 +0000 (-0500)
Subject: feat(Makefile): do not install network-legacy by default
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30d121b1bd4ad2fb26ea72e1b0d5581663179882;p=thirdparty%2Fdracut-ng.git

feat(Makefile): do not install network-legacy by default

This commit is the next step in the multi year effort to
discourage the usage or network-legacy dracut module.

This commit changes the default build/packaging so that
distributions wish to continue using network-legacy would
have to explicitly opt in to it in the packaging step.
---

diff --git a/.github/workflows/integration-extra.yml b/.github/workflows/integration-extra.yml
index 704a555ed..0343d09b2 100644
--- a/.github/workflows/integration-extra.yml
+++ b/.github/workflows/integration-extra.yml
@@ -231,7 +231,7 @@ jobs:
             - name: "Checkout Repository"
               uses: actions/checkout@v6
             - name: "${{ matrix.container }} TEST-${{ matrix.test }}"
-              run: USE_NETWORK=${{ matrix.network }} ./test/test-container.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
+              run: USE_NETWORK=${{ matrix.network }} CONFIGURE_ARG='--enable-network-legacy' ./test/test-container.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
     omitsystemd:
         # run this test on all containers
         name: ${{ matrix.test }} on ${{ matrix.container }} with no systemd
diff --git a/Makefile b/Makefile
index 96c01e9e2..b2cccf0f9 100644
--- a/Makefile
+++ b/Makefile
@@ -275,6 +275,9 @@ endif
 	install -m 0644 shell-completion/bash/lsinitrd $(DESTDIR)${bashcompletiondir}/lsinitrd
 	mkdir -p $(DESTDIR)${pkgconfigdatadir}
 	install -m 0644 dracut.pc $(DESTDIR)${pkgconfigdatadir}/dracut.pc
+ifneq ($(enable_network_legacy),yes)
+	rm -r $(DESTDIR)$(pkglibdir)/modules.d/[0-9][0-9]network-legacy
+endif
 	if ! [ -n "$(systemdsystemunitdir)" ]; then \
 		rm -rf $(DESTDIR)$(pkglibdir)/test/TEST-[0-9][0-9]-*SYSTEMD* ;\
 		rm -rf $(DESTDIR)$(pkglibdir)/modules.d/*systemd* $(DESTDIR)$(mandir)/man8/*.service.* ; \
diff --git a/configure b/configure
index 6cdf271eb..a6d499da7 100755
--- a/configure
+++ b/configure
@@ -82,6 +82,7 @@ while (($# > 0)); do
         --enable-dracut-cpio) enable_dracut_cpio=yes ;;
         --disable-dracut-cpio) enable_dracut_cpio=no ;;
         --enable-test) enable_test=yes ;;
+        --enable-network-legacy) enable_network_legacy=yes ;;
         --configprofile) read_arg configprofile "$@" || shift ;;
         --disable-asciidoctor) disable_asciidoctor=yes ;;
         *) echo "Ignoring unknown option '$1'" ;;
@@ -209,6 +210,7 @@ mandir ?= ${mandir:-${prefix}/share/man}
 disable_asciidoctor ?= ${disable_asciidoctor:-no}
 enable_documentation ?= ${enable_documentation:-yes}
 enable_test ?= ${enable_test:-no}
+enable_network_legacy ?= ${enable_network_legacy:-no}
 enable_dracut_cpio ?= ${enable_dracut_cpio}
 bindir ?= ${bindir:-${prefix}/bin}
 KMOD_CFLAGS ?= $(${PKG_CONFIG} --cflags " libkmod >= 23 ") ${KMOD_CFLAGS_EXTRA}