|
 |
fab351 |
From 53cece208a44c53ecc001cb8eb769f6fb9b3d1dc Mon Sep 17 00:00:00 2001
|
|
|
fab351 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
fab351 |
Date: Mon, 27 May 2019 11:12:22 +0200
|
|
|
fab351 |
Subject: [PATCH] network: parse root=dhcp also with network-manager module
|
|
|
fab351 |
|
|
|
fab351 |
Move the logic from network-legacy to common network code.
|
|
|
fab351 |
|
|
|
fab351 |
(cherry picked from commit 35efada5ecffd139660b4a89f4cc3d627752c91e)
|
|
|
fab351 |
---
|
|
|
fab351 |
modules.d/35network-legacy/module-setup.sh | 1 -
|
|
|
fab351 |
modules.d/{35network-legacy => 40network}/dhcp-root.sh | 0
|
|
|
fab351 |
modules.d/40network/module-setup.sh | 1 +
|
|
|
fab351 |
3 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
fab351 |
|
|
|
fab351 |
diff --git a/modules.d/35network-legacy/module-setup.sh b/modules.d/35network-legacy/module-setup.sh
|
|
|
fab351 |
index 71abda36..5a82e998 100755
|
|
|
fab351 |
--- a/modules.d/35network-legacy/module-setup.sh
|
|
|
fab351 |
+++ b/modules.d/35network-legacy/module-setup.sh
|
|
|
fab351 |
@@ -36,7 +36,6 @@ install() {
|
|
|
fab351 |
inst_simple -H "/etc/dhclient.conf"
|
|
|
fab351 |
cat "$moddir/dhclient.conf" >> "${initdir}/etc/dhclient.conf"
|
|
|
fab351 |
inst_hook pre-udev 60 "$moddir/net-genrules.sh"
|
|
|
fab351 |
- inst_hook cmdline 91 "$moddir/dhcp-root.sh"
|
|
|
fab351 |
inst_hook cmdline 92 "$moddir/parse-ibft.sh"
|
|
|
fab351 |
inst_hook cmdline 95 "$moddir/parse-vlan.sh"
|
|
|
fab351 |
inst_hook cmdline 96 "$moddir/parse-bond.sh"
|
|
|
fab351 |
diff --git a/modules.d/35network-legacy/dhcp-root.sh b/modules.d/40network/dhcp-root.sh
|
|
|
fab351 |
similarity index 100%
|
|
|
fab351 |
rename from modules.d/35network-legacy/dhcp-root.sh
|
|
|
fab351 |
rename to modules.d/40network/dhcp-root.sh
|
|
|
fab351 |
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
|
|
|
fab351 |
index e8541636..8e2a74a3 100755
|
|
|
fab351 |
--- a/modules.d/40network/module-setup.sh
|
|
|
fab351 |
+++ b/modules.d/40network/module-setup.sh
|
|
|
fab351 |
@@ -28,6 +28,7 @@ install() {
|
|
|
fab351 |
inst_script "$moddir/netroot.sh" "/sbin/netroot"
|
|
|
fab351 |
inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh"
|
|
|
fab351 |
inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
|
|
|
fab351 |
+ inst_hook cmdline 91 "$moddir/dhcp-root.sh"
|
|
|
fab351 |
|
|
|
fab351 |
dracut_need_initqueue
|
|
|
fab351 |
}
|
|
|
fab351 |
|