plugins: update conditions for udevd and udevadm commands
On systems with udevd, or systemd-udevd, we must wait for udevd to start
before calling udevadm.  This patch updates service and runtask stanzas
to the new condition system naming and adds 'log' to the udevadm cmds.
@@ -43,19 +43,19 @@ static void setup(void *arg)
path = which("/lib/systemd/systemd-udevd");
if (path) {
/* Register udevd as a monitored service */
- snprintf(cmd, sizeof(cmd), "[S12345789] pid:udevd %s "
+ snprintf(cmd, sizeof(cmd), "[S12345789] pid:udevd name:udevd %s "
"-- Device event managing daemon", path);
if (service_register(SVC_TYPE_SERVICE, cmd, global_rlimit, NULL)) {
_pe("Failed registering %s", path);
} else {
- snprintf(cmd, sizeof(cmd), ":1 [S] <svc%s> "
+ snprintf(cmd, sizeof(cmd), ":1 [S] log <pid/udevd> "
"udevadm trigger -c add -t devices "
- "-- Requesting device events", path);
+ "-- Requesting device events");
service_register(SVC_TYPE_RUN, cmd, global_rlimit, NULL);
- snprintf(cmd, sizeof(cmd), ":2 [S] <svc%s> "
+ snprintf(cmd, sizeof(cmd), ":2 [S] log <pid/udevd> "
"udevadm trigger -c add -t subsystems "
- "-- Requesting subsystem events", path);
+ "-- Requesting subsystem events");
service_register(SVC_TYPE_RUN, cmd, global_rlimit, NULL);
}
