Browse Source

fix(network-manager): show output on console only with rd.debug enabled

The module should show the output on console only when initrd debugging is
enabled.
master
Beniamino Galvani 3 years ago committed by Jóhann B. Guðmundsson
parent
commit
e07b7ad0e7
  1. 9
      modules.d/35network-manager/nm-config.sh
  2. 4
      modules.d/35network-manager/nm-initrd.service

9
modules.d/35network-manager/nm-config.sh

@ -16,6 +16,15 @@ if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then @@ -16,6 +16,15 @@ if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
echo '[logging]'
echo 'level=TRACE'
) > /run/NetworkManager/conf.d/initrd-logging.conf

if [ -n "$DRACUT_SYSTEMD" ]; then
mkdir -p /run/systemd/system/nm-initrd.service.d
cat << EOF > /run/systemd/system/nm-initrd.service.d/tty-output.conf
[Service]
StandardOutput=tty
EOF
systemctl --no-block daemon-reload
fi
fi

nm_generate_connections

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

@ -17,7 +17,9 @@ BusName=org.freedesktop.NetworkManager @@ -17,7 +17,9 @@ BusName=org.freedesktop.NetworkManager
ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
ExecStart=/usr/sbin/NetworkManager --debug
KillMode=process
StandardOutput=tty
# The following gets changed to StandardOutput=tty by nm-config.sh
# when debug is enabled.
StandardOutput=null
Environment=NM_CONFIG_ENABLE_TAG=initrd
Restart=on-failure
ProtectSystem=true

Loading…
Cancel
Save