Browse Source

fix(network-manager): run after dracut-cmdline

dracut-cmdline runs `nm-config.sh`, which generates the configurations.

Also remove the now unused `nm-run.service`.
master
Harald Hoyer 4 years ago committed by Harald Hoyer
parent
commit
4d03404f49
  1. 1
      modules.d/35network-manager/nm-initrd.service
  2. 35
      modules.d/35network-manager/nm-run.service

1
modules.d/35network-manager/nm-initrd.service

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
DefaultDependencies=no
Wants=systemd-udev-settle.service
After=systemd-udev-settle.service
After=dracut-cmdline.service
Before=network.target
ConditionPathExists=/run/NetworkManager/initrd/neednet
ConditionPathExistsGlob=|/usr/lib/NetworkManager/system-connections/*

35
modules.d/35network-manager/nm-run.service

@ -1,35 +0,0 @@ @@ -1,35 +0,0 @@
# This file is part of dracut.
# SPDX-License-Identifier: GPL-2.0-or-later

[Unit]
DefaultDependencies=no

#make sure all devices showed up
Wants=systemd-udev-settle.service
After=systemd-udev-settle.service

#pull the network targets into transaction
Wants=network.target network-online.target
Before=network.target network-online.target

#run before we try to mount anything from the dracut hooks
Before=dracut-initqueue.service

#do not run if networking not needed
ConditionPathExists=/run/NetworkManager/initrd/neednet

#do not run, if there is no configuration
ConditionPathExistsGlob=|/usr/lib/NetworkManager/system-connections/*
ConditionPathExistsGlob=|/run/NetworkManager/system-connections/*
ConditionPathExistsGlob=|/etc/NetworkManager/system-connections/*
ConditionPathExistsGlob=|/etc/sysconfig/network-scripts/ifcfg-*

[Service]
#run the script and wait before it finishes
Type=oneshot
ExecStart=/usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
#don't kill forked off processes (for example: teamd for teaming)
KillMode=process

[Install]
WantedBy=initrd.target
Loading…
Cancel
Save