You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.8 KiB
45 lines
1.8 KiB
7 years ago
|
From 95a6f0f1b2a24e40380af5db1797ee60c8763ca2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Tue, 14 Apr 2015 15:48:26 +0200
|
||
|
|
Subject: [PATCH] udev: downgrade a few warnings to debug messages
|
||
|
|
|
||
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=89885
|
||
|
|
|
||
|
|
Cherry-picked from: 8d8ce9e2
|
||
|
|
Resolves: #1289461
|
||
|
|
---
|
||
|
|
src/udev/udev-builtin-blkid.c | 2 +-
|
||
|
|
src/udev/udev-builtin-usb_id.c | 6 ++----
|
||
|
|
2 files changed, 3 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
|
||
|
|
index 89995831b..2b2c3dad6 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 ab0d96e37..64b763c1e 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))
|