fixed race condition with udev and kvmd-tc358743.service

7 files changed, 8 insertions, 7 deletions

diff --git a/configs/os/services/kvmd-tc358743.service b/configs/os/services/kvmd-tc358743.service
index cb11d391..8ee76f27 100644
--- a/configs/os/services/kvmd-tc358743.service
+++ b/configs/os/services/kvmd-tc358743.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Pi-KVM - EDID loader for TC358743
-After=systemd-modules-load.service
+Wants=dev-kvmd\x2dvideo.device
+After=dev-kvmd\x2dvideo.device systemd-modules-load.service
 Before=kvmd.service
 
 [Service]
diff --git a/configs/os/udev/v0-hdmi-rpi2.rules b/configs/os/udev/v0-hdmi-rpi2.rules
index 835b1fb4..f4c033da 100644
--- a/configs/os/udev/v0-hdmi-rpi2.rules
+++ b/configs/os/udev/v0-hdmi-rpi2.rules
@@ -1,4 +1,4 @@
 # https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name
 # https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names
-KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video"
+KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd"
 KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid"
diff --git a/configs/os/udev/v0-hdmi-rpi3.rules b/configs/os/udev/v0-hdmi-rpi3.rules
index 835b1fb4..f4c033da 100644
--- a/configs/os/udev/v0-hdmi-rpi3.rules
+++ b/configs/os/udev/v0-hdmi-rpi3.rules
@@ -1,4 +1,4 @@
 # https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name
 # https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names
-KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video"
+KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd"
 KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid"
diff --git a/configs/os/udev/v1-hdmi-rpi2.rules b/configs/os/udev/v1-hdmi-rpi2.rules
index ad57483d..656d9a68 100644
--- a/configs/os/udev/v1-hdmi-rpi2.rules
+++ b/configs/os/udev/v1-hdmi-rpi2.rules
@@ -1,5 +1,5 @@
 # https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name
 # https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names
-KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video"
+KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd"
 KERNEL=="sd[a-z]", SUBSYSTEM=="block", KERNELS=="1-1.4:1.0", GROUP="kvmd", SYMLINK+="kvmd-msd"
 KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid"
diff --git a/configs/os/udev/v1-hdmi-rpi3.rules b/configs/os/udev/v1-hdmi-rpi3.rules
index 32a00163..a05353eb 100644
--- a/configs/os/udev/v1-hdmi-rpi3.rules
+++ b/configs/os/udev/v1-hdmi-rpi3.rules
@@ -1,5 +1,5 @@
 # https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name
 # https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names
-KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video"
+KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd"
 KERNEL=="sd[a-z]", SUBSYSTEM=="block", KERNELS=="1-1.1.2:1.0", GROUP="kvmd", SYMLINK+="kvmd-msd"
 KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid"
diff --git a/configs/os/udev/v2-hdmi-rpi4.rules b/configs/os/udev/v2-hdmi-rpi4.rules
index 93c7694f..2cc1cd24 100644
--- a/configs/os/udev/v2-hdmi-rpi4.rules
+++ b/configs/os/udev/v2-hdmi-rpi4.rules
@@ -1,5 +1,5 @@
 # https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name
 # https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names
-KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="fe801000.csi|fe801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video"
+KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="fe801000.csi|fe801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd"
 KERNEL=="hidg0", GROUP="kvmd", SYMLINK+="kvmd-hid-keyboard"
 KERNEL=="hidg1", GROUP="kvmd", SYMLINK+="kvmd-hid-mouse"
diff --git a/configs/os/udev/v2-hdmi-zerow.rules b/configs/os/udev/v2-hdmi-zerow.rules
index 25ad13de..35010801 100644
--- a/configs/os/udev/v2-hdmi-zerow.rules
+++ b/configs/os/udev/v2-hdmi-zerow.rules
@@ -1,5 +1,5 @@
 # https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name
 # https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names
-KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="20801000.csi|20801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video"
+KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="20801000.csi|20801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd"
 KERNEL=="hidg0", GROUP="kvmd", SYMLINK+="kvmd-hid-keyboard"
 KERNEL=="hidg1", GROUP="kvmd", SYMLINK+="kvmd-hid-mouse"