udev: use pb_log for device SKIP messages

We often want to find out why a device has been skipped, so include the
SKIP messages at pb_log, which doesn't require a -DDEBUG build.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/udev.c b/discover/udev.c
index 7a99eeaf9d772433c4e7f507a4be2f5e7f5dfa06..b1a25b3e639925ee753b53ad4830c9db75e2a7ba 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -79,7 +79,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
        }
 
        if (!(!strcmp(typestr, "disk") || !strcmp(typestr, "partition"))) {
        }
 
        if (!(!strcmp(typestr, "disk") || !strcmp(typestr, "partition"))) {

-               pb_debug("SKIP %s: invalid type %s\n", name, typestr);
+               pb_log("SKIP %s: invalid type %s\n", name, typestr);

                return 0;
        }
 
                return 0;
        }
 


@@ -87,7 +87,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
        path = udev_device_get_devpath(dev);
        if (path && (strstr(path, "virtual/block/loop")
                        || strstr(path, "virtual/block/ram"))) {
        path = udev_device_get_devpath(dev);
        if (path && (strstr(path, "virtual/block/loop")
                        || strstr(path, "virtual/block/ram"))) {

-               pb_debug("SKIP: %s: ignored (path=%s)\n", name, path);
+               pb_log("SKIP: %s: ignored (path=%s)\n", name, path);

                return 0;
        }
 
                return 0;
        }
 


@@ -97,14 +97,14 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
                 * petitboot-compatible tray behaviour */
                cdrom_init(node);
                if (!cdrom_media_present(node)) {
                 * petitboot-compatible tray behaviour */
                cdrom_init(node);
                if (!cdrom_media_present(node)) {

-                       pb_debug("SKIP: %s: no media present\n", name);
+                       pb_log("SKIP: %s: no media present\n", name);

                        return 0;
                }
        }
 
        type = udev_device_get_property_value(dev, "ID_FS_TYPE");
        if (!type) {
                        return 0;
                }
        }
 
        type = udev_device_get_property_value(dev, "ID_FS_TYPE");
        if (!type) {

-               pb_debug("SKIP: %s: no ID_FS_TYPE property\n", name);
+               pb_log("SKIP: %s: no ID_FS_TYPE property\n", name);

                return 0;
        }
 
                return 0;
        }
 


@@ -164,7 +164,7 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
                return udev_handle_block_add(udev, dev, name);
        }
 
                return udev_handle_block_add(udev, dev, name);
        }
 

-       pb_debug("SKIP %s: unknown subsystem %s\n", name, subsys);
+       pb_log("SKIP %s: unknown subsystem %s\n", name, subsys);

        return -1;
 }
 
        return -1;
 }