shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 20:25:38 +03:00
Code

udevadm: print all messages to stderr with priority higher or equal than LOG_ERR

Browse Source 
It is needed to prevent errors in udev from going unnoticed (e.g.
when udevd is not running).
This commit is contained in:
Marco d'Itri 2009-09-14 13:56:38 +02:00 committed by Kay Sievers
parent b6a2637524
commit bbfeee28fc
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
udev/udevadm-control.c
View File

@ -81,8 +81,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
break;
if (option > 255) {
fprintf(stderr, "udevadm control expects commands without underscore, "
"this will stop working in a future release\n");
err(udev, "udevadm control expects commands without underscore, "
"this will stop working in a future release\n");
}
@ -144,8 +142,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
if (argv[optind] != NULL) {
const char *arg = argv[optind];
fprintf(stderr, "udevadm control commands requires the --<command> format, "
"this will stop working in a future release\n");
err(udev, "udevadm control commands requires the --<command> format, "
"this will stop working in a future release\n");
@ -177,7 +173,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
}
if (rc != 0) {
fprintf(stderr, "unrecognized command\n");
err(udev, "unrecognized command\n");
}
exit:

3
udev/udevadm-settle.c
View File

@ -140,14 +140,12 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
if (start > end) {
err(udev, "seq-start larger than seq-end, ignoring\n");
fprintf(stderr, "seq-start larger than seq-end, ignoring\n");
start = 0;
end = 0;
}
if (start > kernel_seq || end > kernel_seq) {
err(udev, "seq-start or seq-end larger than current kernel value, ignoring\n");
fprintf(stderr, "seq-start or seq-end larger than current kernel value, ignoring\n");
start = 0;
end = 0;
}
@ -155,7 +153,6 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
} else {
if (end > 0) {
err(udev, "seq-end needs seq-start parameter, ignoring\n");
fprintf(stderr, "seq-end needs seq-start parameter, ignoring\n");
end = 0;
}
}

1
udev/udevadm-trigger.c
View File

@ -146,7 +146,6 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
} else if (strcmp(optarg, "failed") == 0) {
device_type = TYPE_FAILED;
} else {
fprintf(stderr, "unknown type --type=%s\n", optarg);
err(udev, "unknown type --type=%s\n", optarg);
rc = 2;
goto exit;

2
udev/udevadm.c
View File

@ -35,6 +35,8 @@ static void log_fn(struct udev *udev, int priority,
fprintf(stderr, "%s: ", fn);
vfprintf(stderr, format, args);
} else {
if (priority <= LOG_ERR)
vfprintf(stderr, format, args);
vsyslog(priority, format, args);
}
}