discover: Rename struct udev to struct pb_udev

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index bc0282749fe282521c15017dbff539a69527866c..bb9331b02c2a98432f70933ac7ae5190522176e5 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -1,17 +1,19 @@
 
 #define _GNU_SOURCE
 
-#include <stdlib.h>
+#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <sys/un.h>
 
+#include <log/log.h>
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
-#include <log/log.h>
+#include <system/system.h>
 
 #include "event.h"
 #include "udev.h"
@@ -22,7 +24,7 @@
 
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
-struct udev {
+struct pb_udev {
        struct device_handler *handler;
        int socket;
 };
@@ -30,7 +32,12 @@ struct udev {
 static void udev_print_event(struct event *event)
 {
        const char *action, *params[] = {
-               "DEVNAME", "ID_TYPE", "ID_BUS", "ID_FS_UUID", "ID_FS_LABEL",
+               "DEVNAME",
+               "DEVPATH",
+               "ID_TYPE",
+               "ID_BUS",
+               "ID_FS_UUID",
+               "ID_FS_LABEL",
                NULL,
        };
        int i;
@@ -43,13 +50,13 @@ static void udev_print_event(struct event *event)
        for (i = 0; params[i]; i++)
                pb_log("\t%-12s => %s\n",
                                params[i], event_get_param(event, params[i]));
-
 }
 
-static void udev_handle_message(struct udev *udev, char *buf, int len)
+static void udev_handle_message(struct pb_udev *udev, char *buf, int len)
 {
        int result;
        struct event *event;
+       const char *devpath;
 
        event = talloc(udev, struct event);
        event->type = EVENT_TYPE_UDEV;
@@ -62,7 +69,17 @@ static void udev_handle_message(struct udev *udev, char *buf, int len)
                return;
 
        udev_print_event(event);
-       device_handler_event(udev->handler, event);
+
+       /* Ignore ram, loop, and devices with no DEVNAME. */
+
+       devpath = event_get_param(event, "DEVPATH");
+
+       if (event_get_param(event, "DEVNAME")
+               && !strstr(devpath, "virtual/block/loop")
+               && !strstr(devpath, "virtual/block/ram")) {
+               device_handler_event(udev->handler, event);
+       }
+
        talloc_free(event);
 
        return;
@@ -70,7 +87,7 @@ static void udev_handle_message(struct udev *udev, char *buf, int len)
 
 static int udev_process(void *arg)
 {
-       struct udev *udev = arg;
+       struct pb_udev *udev = arg;
        char buf[4096];
        int len;
 
@@ -91,7 +108,7 @@ static int udev_process(void *arg)
 
 static int udev_destructor(void *p)
 {
-       struct udev *udev = p;
+       struct pb_udev *udev = p;
 
        if (udev->socket >= 0)
                close(udev->socket);
@@ -99,14 +116,14 @@ static int udev_destructor(void *p)
        return 0;
 }
 
-struct udev *udev_init(struct device_handler *handler)
+struct pb_udev *udev_init(struct waitset *waitset, struct device_handler *handler)
 {
        struct sockaddr_un addr;
-       struct udev *udev;
+       struct pb_udev *udev;
 
        unlink(PBOOT_DEVICE_SOCKET);
 
-       udev = talloc(NULL, struct udev);
+       udev = talloc(NULL, struct pb_udev);
 
        udev->handler = handler;
 
@@ -118,6 +135,7 @@ struct udev *udev_init(struct device_handler *handler)
 
        talloc_set_destructor(udev, udev_destructor);
 
+       memset(&addr, 0, sizeof addr);
        addr.sun_family = AF_UNIX;
        strcpy(addr.sun_path, PBOOT_DEVICE_SOCKET);
 
@@ -126,7 +144,7 @@ struct udev *udev_init(struct device_handler *handler)
                goto out_err;
        }
 
-       waiter_register(udev->socket, WAIT_IN, udev_process, udev);
+       waiter_register(waitset, udev->socket, WAIT_IN, udev_process, udev);
 
        pb_log("%s: waiting on %s\n", __func__, PBOOT_DEVICE_SOCKET);
 
@@ -137,9 +155,18 @@ out_err:
        return NULL;
 }
 
-int udev_trigger(struct udev __attribute__((unused)) *udev)
+int udev_trigger(struct pb_udev __attribute__((unused)) *udev)
 {
-       int rc = system("/sbin/udevadm trigger --subsystem-match=block --action=add");
+       const char *cmd[] = {
+               pb_system_apps.udevadm,
+               "trigger",
+               "--subsystem-match=block",
+               "--action=add",
+               NULL,
+       };
+       int rc;
+
+       rc = pb_run_cmd(cmd, 1, 0);
 
        if (rc)
                pb_log("udev trigger failed: %d (%d)\n", rc, WEXITSTATUS(rc));
@@ -147,7 +174,7 @@ int udev_trigger(struct udev __attribute__((unused)) *udev)
        return WEXITSTATUS(rc);
 }
 
-void udev_destroy(struct udev *udev)
+void udev_destroy(struct pb_udev *udev)
 {
        talloc_free(udev);
 }