dd8de797e3
Previously, network uplink (eth0) was configured in two places:
- udev (asynchronously)
- qubes-misc-post.service - at the very end of the boot process
This caused multiple issues:
1. Depending on udev event processing (non-deterministic), network
uplink could be enabled too early, for example before setting up
firewall.
2. Again depending on udev processing, it can be enabled quite late in
the boot process, after network.target is up and services assume
network already configured. This for example causes qubes-firewall to
fail DNS queries.
3. If udev happen try to enable enable networking even earlier, it may
happend before qubesdb-daemon is started, in which case network setup
fill fail. For this case, there was network re-setup in
qubes-misc-post service - much later in the boot.
Fix the above by placing network uplink setup in a dedicated
qubes-network-uplink@${INTERFACE}.service unit ordered after
network-pre.target and pulled in by udev based on vif device existence,
to handle also dynamic network attach/detach.
Then, create qubes-network-uplink.service unit waiting for appropriate
interface-specific unit (if one is expected!) and order it before
network.target.
QubesOS/qubes-issues#5576
17 lines
636 B
Bash
17 lines
636 B
Bash
#!/bin/sh
|
|
|
|
# Source Qubes library.
|
|
# shellcheck source=init/functions
|
|
. /usr/lib/qubes/init/functions
|
|
|
|
# Setup IP address at specific time of system boot, instead of asynchronously
|
|
# by udev
|
|
QUBES_MANAGED_IFACE="$(get_qubes_managed_iface)"
|
|
if [ "x$QUBES_MANAGED_IFACE" != "x" ]; then
|
|
# systemd does not support conditional After= dependencies, nor a tool to
|
|
# just wait for the unit to be activated
|
|
# if the network interface is expected, use `systemctl start` to wait for
|
|
# it to be started - it would be started by udev (SYSTEMD_WANTS) anyway
|
|
systemctl start "qubes-network-uplink@$QUBES_MANAGED_IFACE.service"
|
|
fi
|