fix(network-manager): disable tty output if the console is not usable
The network-manager module also writes logs to the console, so that it's easier to debug network-related boot issues. If systemd can't open the console, the service fails and network doesn't get configured. Add a check to disable tty output when the console is not present or not usable. https://github.com/coreos/fedora-coreos-tracker/issues/943master
parent
e07b7ad0e7
commit
f6e6be245d
|
@ -18,12 +18,17 @@ if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
|
|||
) > /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
|
||||
# Enable tty output if a usable console is found
|
||||
# See https://github.com/coreos/fedora-coreos-tracker/issues/943
|
||||
# shellcheck disable=SC2217
|
||||
if [ -w /dev/console ] && (echo < /dev/console) > /dev/null 2> /dev/null; 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
|
||||
systemctl --no-block daemon-reload
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/
|
|||
ExecStart=/usr/sbin/NetworkManager --debug
|
||||
KillMode=process
|
||||
# The following gets changed to StandardOutput=tty by nm-config.sh
|
||||
# when debug is enabled.
|
||||
# when debug is enabled and a usable console is found.
|
||||
StandardOutput=null
|
||||
Environment=NM_CONFIG_ENABLE_TAG=initrd
|
||||
Restart=on-failure
|
||||
|
|
Loading…
Reference in New Issue