qm-oci-hooks: various fixes

Split seat and devices hooks as otherwise the
annotations were not matching correctly to execute
the hooks when they should.

Also, fix the package to add a missing dependency
to include udevadm application.

Signed-off-by: Albert Esteve <[email protected]>

Author: aesteve-rh

oci-hooks/qm-device-manager/oci-qm-device-manager.json

@@ -5,8 +5,7 @@
     },
     "when": {
         "annotations": {
-            "^org\\.containers\\.qm\\.device\\..*$": "^.*$",
-            "^org\\.containers\\.qm\\.wayland\\.seat": "^.*$"
+            "^org\\.containers\\.qm\\.device\\..*$": "^.*$"
         }
     },
     "stages": ["precreate"]

oci-hooks/qm-seat-manager/oci-qm-seat-manager.json

@@ -0,0 +1,12 @@
+{
+    "version": "1.0.0",
+    "hook": {
+        "path": "/usr/libexec/oci/hooks.d/oci-qm-device-manager"
+    },
+    "when": {
+        "annotations": {
+            "^org\\.containers\\.qm\\.wayland\\.seat": "^.*$"
+        }
+    },
+    "stages": ["precreate"]
+}

oci-hooks/tests/test_hook_configs.py

@@ -242,6 +242,14 @@ def test_hook_executable_exists(self, hook_configs, hook_name):
             # If absolute path fails, try relative to config file
             hook_path = config_path.parent / hook_path.name
 
+            # Special case: seat manager uses the shared device manager executable
+            if not hook_path.exists() and hook_name == "oci-qm-seat-manager":
+                hook_path = (
+                    config_path.parent.parent
+                    / "qm-device-manager"
+                    / hook_path.name
+                )
+
         assert hook_path.exists(), f"Hook executable not found: {hook_path}"
         assert hook_path.is_file(), f"Hook executable not a file: {hook_path}"
 
@@ -262,12 +270,6 @@ def test_device_manager_annotations(self, hook_configs):
             device_patterns
         ), "Device manager should support device annotations"
 
-        # Check that wayland patterns exist
-        wayland_patterns = [p for p in annotations.keys() if "wayland" in p]
-        assert (
-            wayland_patterns
-        ), "Device manager should support Wayland annotations"
-
         # Test that device patterns match expected device types
         test_annotations = [
             "org.containers.qm.device.audio",
@@ -402,6 +404,17 @@ def test_hook_config_integration(self, hook_configs, hook_name):
             # If absolute path fails, try relative to config directory
             full_hook_path = config_path.parent / Path(hook_path).name
 
+            # Special case: seat manager uses the shared device manager executable
+            if (
+                not full_hook_path.exists()
+                and hook_name == "oci-qm-seat-manager"
+            ):
+                full_hook_path = (
+                    config_path.parent.parent
+                    / "qm-device-manager"
+                    / Path(hook_path).name
+                )
+
         # Check that executable exists
         assert full_hook_path.exists(), (
             f"Hook executable not found: {full_hook_path} "

rpm/oci-hooks/qm-oci-hooks.spec

@@ -12,6 +12,8 @@ BuildRequires: git-core
 
 # Runtime dependencies
 Requires: jq
+Requires: systemd-udev
+Requires: findutils
 
 %description
 This package provides OCI hooks for QM containers that enable dynamic
@@ -21,6 +23,7 @@ This package is independent and can be installed within the qm container.
 
 Included hooks:
 - qm-device-manager: Dynamic device mounting based on container annotations
+- qm-seat-manager: Wayland seat device management for systemd-logind integration
 - wayland-client-devices: GPU hardware acceleration for Wayland clients
 
 The hooks are installed in standard locations:
@@ -46,6 +49,10 @@ install -m 755 oci-hooks/qm-device-manager/oci-qm-device-manager \
 install -m 644 oci-hooks/qm-device-manager/oci-qm-device-manager.json \
     %{buildroot}%{_datadir}/containers/oci/hooks.d/oci-qm-device-manager.json
 
+# Install QM Seat Manager hook
+install -m 644 oci-hooks/qm-seat-manager/oci-qm-seat-manager.json \
+    %{buildroot}%{_datadir}/containers/oci/hooks.d/oci-qm-seat-manager.json
+
 # Install Wayland Client Devices hook
 install -m 755 oci-hooks/wayland-client-devices/oci-qm-wayland-client-devices \
     %{buildroot}%{_libexecdir}/oci/hooks.d/oci-qm-wayland-client-devices
@@ -84,6 +91,7 @@ install -m 644 oci-hooks/wayland-client-devices/README.md \
 %dir %{_datadir}/containers/oci
 %dir %{_datadir}/containers/oci/hooks.d
 %{_datadir}/containers/oci/hooks.d/oci-qm-device-manager.json
+%{_datadir}/containers/oci/hooks.d/oci-qm-seat-manager.json
 %{_datadir}/containers/oci/hooks.d/oci-qm-wayland-client-devices.json
 
 

subsystems/qm-oci-hooks/Makefile

@@ -22,6 +22,7 @@ dist: ##             - Creates the QM OCI hooks package
 		../qm/CODE-OF-CONDUCT.md \
 		../qm/oci-hooks/qm-device-manager/oci-qm-device-manager \
 		../qm/oci-hooks/qm-device-manager/oci-qm-device-manager.json \
+		../qm/oci-hooks/qm-seat-manager/oci-qm-seat-manager.json \
 		../qm/oci-hooks/qm-device-manager/README.md \
 		../qm/oci-hooks/wayland-client-devices/oci-qm-wayland-client-devices \
 		../qm/oci-hooks/wayland-client-devices/oci-qm-wayland-client-devices.json \