diff --git a/dracut.spec b/dracut.spec index 995c3b8baa5b3989dcb530773ec75404dab2fd8f..ffa3d4924f22c57f802edba03957aa7d53e4a265 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 055 -Release: 2 +Release: 3 Summary: Initramfs generator using udev @@ -29,6 +29,7 @@ Patch2: skip-the-broken-sd-in-initqueue.patch Patch3: use-sleep-replace-check-sys-block.patch Patch4: add-option-to-include-file-metadata-in-initramfs.patch Patch5: revert-fix-systemd-networkd-make-systemd-networkd.patch +Patch6: make-network-legacy-instead-of-network-manager-the-network.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source2: openEuler.conf.example @@ -498,6 +499,10 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %endif %changelog +* Mon Jan 17 2022 panxiaohe - 055-3 +- make network-legacy instead of network-manager + the network provider + * Wed Aug 25 2021 panxiaohe - 055-2 - revert patch "make systemd networkd a proper network provider" to use network-legacy. diff --git a/make-network-legacy-instead-of-network-manager-the-network.patch b/make-network-legacy-instead-of-network-manager-the-network.patch new file mode 100644 index 0000000000000000000000000000000000000000..cefbd18e5917bb9aec16fd1f68549bc5fe596ce7 --- /dev/null +++ b/make-network-legacy-instead-of-network-manager-the-network.patch @@ -0,0 +1,26 @@ +From 9c3c197ce47bc45d0ea97bd3d4e05860c778df1b Mon Sep 17 00:00:00 2001 +From: panxiaohe +Date: Mon, 17 Jan 2022 19:53:41 +0800 +Subject: [PATCH] make network-legacy instead of network-manager the network + provider + +--- + modules.d/40network/module-setup.sh | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh +index cbb5b70..5396a49 100755 +--- a/modules.d/40network/module-setup.sh ++++ b/modules.d/40network/module-setup.sh +@@ -19,8 +19,6 @@ depends() { + if [ -z "$network_handler" ]; then + if [[ -x $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then + network_handler="network-wicked" +- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then +- network_handler="network-manager" + else + network_handler="network-legacy" + fi +-- +1.8.3.1 +