discover/udev: Don't print properties of skipped devices

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 3942a3d70018268570fdd83bbb127631b571576c..cd2a61ef6813ba9ee6907b7ef026429b8e44f22e 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -102,8 +102,6 @@ static int udev_handle_dev_action(struct udev_device *dev, const char *action)
                return -1;
        }
 
-       print_device_properties(dev);
-
        /* Ignore non disk or partition, ram, loop. */
 
        if (!(strstr(devtype, "disk") || strstr(devtype, "partition"))
@@ -124,6 +122,8 @@ static int udev_handle_dev_action(struct udev_device *dev, const char *action)
                return 0;
        }
 
+       print_device_properties(dev);
+
        event = talloc(NULL, struct event);
 
        event->type = EVENT_TYPE_UDEV;
@@ -305,7 +305,7 @@ struct pb_udev *udev_init(struct waitset *waitset,
        waiter_register(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
                udev_process, udev->monitor);
 
-       pb_log("%s: waiting on %s\n", __func__, udev_get_sys_path(udev->udev));
+       pb_log("%s: waiting on udev\n", __func__);
 
        return udev;
 
@@ -317,11 +317,6 @@ fail_new:
        return NULL;
 }
 
-int udev_trigger(struct pb_udev __attribute__((unused)) *udev)
-{
-       return 0;
-}
-
 void udev_destroy(struct pb_udev *udev)
 {
        talloc_free(udev);