Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/default_hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ restart_network () {
if systemctl status systemd-networkd > /dev/null 2>&1; then
echo "default_hook: system is using systemd-networkd; restarting..."
systemctl restart systemd-udev-trigger
# Wait until udev finishes processing net events so systemd-networkd
# computes DHCPv6 IAID from the restored ID_NET_NAME_* properties.
if ! udevadm settle --timeout=5; then
echo "default_hook: ERROR: udevadm settle timed out"
fi
systemctl restart systemd-networkd
elif systemctl status NetworkManager > /dev/null 2>&1; then
echo "default_hook: system is using NetworkManager; restarting..."
Expand Down
8 changes: 8 additions & 0 deletions vpp-manager/hooks/network_manager_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,14 @@ func (h *NetworkManagerHook) restartSystemdNetworkd() error {
if err != nil {
h.log.Warnf("NetworkManagerHook: Failed to restart systemd-udev-trigger before systemd-networkd: %v", err)
}

// Wait for udev to finish processing net events so systemd-networkd
// can compute DHCPv6 IAID from restored ID_NET_NAME_* properties.
cmd := h.chrootCommand("udevadm", "settle", "--timeout=5")
if err := cmd.Run(); err != nil {
h.log.Errorf("NetworkManagerHook: ERROR: udevadm settle timed out: %v", err)
}

return h.restartService("systemd-networkd")
}

Expand Down
Loading