Merge pull request #683 from stgraber/main

incus-osd/systemd/networkd: Only trigger network devices

Author: gibmat

incus-osd/internal/systemd/networkd.go

@@ -152,11 +152,14 @@ func ApplyNetworkConfiguration(ctx context.Context, s *state.State, networkCfg *
 	// Refresh registration, delaying by 30 seconds if needed to allow the provider to become available,
 	// such as when IncusOS is self-hosting Operations Center.
 	if refresh != nil {
-		go func() {
+		go func() { //nolint:contextcheck
 			if delayRefreshCheck {
 				time.Sleep(30 * time.Second)
 			}
 
+			ctx, ctxCancel := context.WithTimeout(context.Background(), 30*time.Second)
+			defer ctxCancel()
+
 			err := refresh(ctx, s)
 			if err != nil {
 				slog.WarnContext(ctx, "Failed to refresh provider registration", "err", err)
@@ -689,7 +692,7 @@ func waitForUdevInterfaceRename(ctx context.Context, expectedInterfaces []string
 		}
 
 		// Trigger udev rule update to pickup device names.
-		_, err := subprocess.RunCommandContext(ctx, "udevadm", "trigger", "--action=add")
+		_, err := subprocess.RunCommandContext(ctx, "udevadm", "trigger", "--action=add", "--subsystem-match=net")
 		if err != nil {
 			return err
 		}