[systemd-commits] src/udev

Lennart Poettering lennart at kemper.freedesktop.org
Tue Apr 14 06:54:47 PDT 2015


 src/udev/udev-builtin-blkid.c  |    2 +-
 src/udev/udev-builtin-usb_id.c |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 8d8ce9e2cd066e90c17e2d1eb1882defabb1fa63
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 14 15:48:26 2015 +0200

    udev: downgrade a few warnings to debug messages
    
    https://bugs.freedesktop.org/show_bug.cgi?id=89885

diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index f4f6900..1dad447 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -263,7 +263,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
 
         fd = open(udev_device_get_devnode(dev), O_RDONLY|O_CLOEXEC);
         if (fd < 0) {
-                fprintf(stderr, "error: %s: %m\n", udev_device_get_devnode(dev));
+                err = log_debug_errno(errno, "Failure opening block device %s: %m", udev_device_get_devnode(dev));
                 goto out;
         }
 
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index e6c27a9..25ae032 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -168,10 +168,8 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len
                 return log_oom();
 
         fd = open(filename, O_RDONLY|O_CLOEXEC);
-        if (fd < 0) {
-                fprintf(stderr, "error opening USB device 'descriptors' file\n");
-                return -errno;
-        }
+        if (fd < 0)
+                return log_debug_errno(errno, "Error opening USB device 'descriptors' file: %m");
 
         size = read(fd, buf, sizeof(buf));
         if (size < 18 || size == sizeof(buf))



More information about the systemd-commits mailing list