!49 make network-legacy instead of network-manager the network provider

Merge pull request !49 from panxh_purple/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-17 12:59:50 +00:00 committed by Gitee
commit 1a1969e138
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions

View File

@ -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 <panxiaohe@huawei.com> - 055-3
- make network-legacy instead of network-manager
the network provider
* Wed Aug 25 2021 panxiaohe <panxiaohe@huawei.com> - 055-2
- revert patch "make systemd networkd a proper network
provider" to use network-legacy.

View File

@ -0,0 +1,26 @@
From 9c3c197ce47bc45d0ea97bd3d4e05860c778df1b Mon Sep 17 00:00:00 2001
From: panxiaohe <panxiaohe@huawei.com>
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