File tree 4 files changed +12
-8
lines changed
4 files changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -21,6 +21,13 @@ installkernel() {
21
21
# called by dracut
22
22
install () {
23
23
local _arch
24
+
25
+ # Adding default link
26
+ if dracut_module_included " systemd" ; then
27
+ inst_multiple -o " ${systemdutildir} /network/99-default.link"
28
+ [[ $hostonly ]] && inst_multiple -H -o " ${systemdsystemconfdir} /network/*.link"
29
+ fi
30
+
24
31
inst_multiple ip dhclient sed awk grep pgrep tr
25
32
26
33
inst_multiple -o arping arping2
Original file line number Diff line number Diff line change @@ -45,6 +45,10 @@ install() {
45
45
inst_simple " $moddir " /nm-initrd.service " $systemdsystemunitdir " /nm-initrd.service
46
46
inst_simple " $moddir " /nm-wait-online-initrd.service " $systemdsystemunitdir " /nm-wait-online-initrd.service
47
47
48
+ # Adding default link
49
+ inst_multiple -o " ${systemdutildir} /network/99-default.link"
50
+ [[ $hostonly ]] && inst_multiple -H -o " ${systemdsystemconfdir} /network/*.link"
51
+
48
52
$SYSTEMCTL -q --root " $initdir " enable nm-initrd.service
49
53
fi
50
54
Original file line number Diff line number Diff line change @@ -57,11 +57,6 @@ install() {
57
57
# legacy persistent network device name rules
58
58
[[ $hostonly ]] && inst_rules 70-persistent-net.rules
59
59
60
- if dracut_module_included " systemd" ; then
61
- inst_multiple -o " ${systemdutildir} /network/*.link"
62
- [[ $hostonly ]] && inst_multiple -H -o " /etc/systemd/network/*.link"
63
- fi
64
-
65
60
{
66
61
for i in cdrom tape dialout floppy; do
67
62
if ! grep -q " ^$i :" " $initdir " /etc/group 2> /dev/null; then
Original file line number Diff line number Diff line change @@ -242,8 +242,7 @@ test_setup() {
242
242
)
243
243
inst /etc/passwd /etc/passwd
244
244
inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
245
- dmesg mkdir cp ping \
246
- modprobe tcpdump setsid \
245
+ dmesg mkdir cp ping modprobe tcpdump setsid \
247
246
/etc/services sleep mount chmod pidof
248
247
inst_multiple tgtd tgtadm
249
248
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
@@ -314,7 +313,6 @@ test_setup() {
314
313
inst_multiple poweroff shutdown
315
314
inst_hook shutdown-emergency 000 ./hard-off.sh
316
315
inst_hook emergency 000 ./hard-off.sh
317
- inst_simple ./99-default.link /etc/systemd/network/99-default.link
318
316
)
319
317
320
318
# Make server's dracut image
You can’t perform that action at this time.
0 commit comments