kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(udev-rules): remove sourcing of network link files 

Removing sourcing of network link files from the udev-rules module.
What always should be included should be placed in the systemd-network
module and other modules that provide/require spesific link files
should add them, themselves via their relevant include section.
master
Jóhann B. Guðmundsson 2021-04-28 15:11:46 +00:00 committed by Harald Hoyer
parent fd883a58d1
commit 69f4e7cdc3
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules.d/35network-legacy/module-setup.sh
View File

@ -21,6 +21,13 @@ installkernel() {
# called by dracut # called by dracut
install() { install() {
local _arch local _arch

#Adding default link
if dracut_module_included "systemd"; then
inst_multiple -o "${systemdutildir}/network/99-default.link"
[[ $hostonly ]] && inst_multiple -H -o "${systemdsystemconfdir}/network/*.link"
fi

inst_multiple ip dhclient sed awk grep pgrep tr inst_multiple ip dhclient sed awk grep pgrep tr


inst_multiple -o arping arping2 inst_multiple -o arping arping2

4
modules.d/35network-manager/module-setup.sh
View File

@ -45,6 +45,10 @@ install() {
inst_simple "$moddir"/nm-initrd.service "$systemdsystemunitdir"/nm-initrd.service inst_simple "$moddir"/nm-initrd.service "$systemdsystemunitdir"/nm-initrd.service
inst_simple "$moddir"/nm-wait-online-initrd.service "$systemdsystemunitdir"/nm-wait-online-initrd.service inst_simple "$moddir"/nm-wait-online-initrd.service "$systemdsystemunitdir"/nm-wait-online-initrd.service


# Adding default link
inst_multiple -o "${systemdutildir}/network/99-default.link"
[[ $hostonly ]] && inst_multiple -H -o "${systemdsystemconfdir}/network/*.link"

$SYSTEMCTL -q --root "$initdir" enable nm-initrd.service $SYSTEMCTL -q --root "$initdir" enable nm-initrd.service
fi fi



5
modules.d/95udev-rules/module-setup.sh
View File

@ -57,11 +57,6 @@ install() {
# legacy persistent network device name rules # legacy persistent network device name rules
[[ $hostonly ]] && inst_rules 70-persistent-net.rules [[ $hostonly ]] && inst_rules 70-persistent-net.rules


if dracut_module_included "systemd"; then
inst_multiple -o "${systemdutildir}/network/*.link"
[[ $hostonly ]] && inst_multiple -H -o "/etc/systemd/network/*.link"
fi

{ {
for i in cdrom tape dialout floppy; do for i in cdrom tape dialout floppy; do
if ! grep -q "^$i:" "$initdir"/etc/group 2> /dev/null; then if ! grep -q "^$i:" "$initdir"/etc/group 2> /dev/null; then

4
test/TEST-30-ISCSI/test.sh
View File

@ -242,8 +242,7 @@ test_setup() {
) )
inst /etc/passwd /etc/passwd inst /etc/passwd /etc/passwd
inst_multiple sh ls shutdown poweroff stty cat ps ln ip \ inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
dmesg mkdir cp ping \ dmesg mkdir cp ping modprobe tcpdump setsid \
modprobe tcpdump setsid \
/etc/services sleep mount chmod pidof /etc/services sleep mount chmod pidof
inst_multiple tgtd tgtadm inst_multiple tgtd tgtadm
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
@ -314,7 +313,6 @@ test_setup() {
inst_multiple poweroff shutdown inst_multiple poweroff shutdown
inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook shutdown-emergency 000 ./hard-off.sh
inst_hook emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh
inst_simple ./99-default.link /etc/systemd/network/99-default.link
) )


# Make server's dracut image # Make server's dracut image