From f1e7e360465acc7fb038e941c398216cdb569253 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 7 Mar 2009 02:32:40 +0100 Subject: [PATCH 1/1] udevadm: add text for new options to command and man page --- udev/udevadm-info.c | 3 +-- udev/udevadm-monitor.c | 2 +- udev/udevadm-settle.c | 7 ++++++- udev/udevadm-test.c | 2 +- udev/udevadm-trigger.c | 3 +-- udev/udevadm.xml | 12 ++++++++++++ 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c index b9892eca0..f20eb07e0 100644 --- a/udev/udevadm-info.c +++ b/udev/udevadm-info.c @@ -387,8 +387,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) " of parent devices\n" " --device-id-of-file= print major:minor of device containing this file\n" " --export-db export the content of the udev database\n" - " --help print this text\n" - "\n"); + " --help\n\n"); goto exit; default: goto exit; diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c index 14a6edc84..77d98facd 100644 --- a/udev/udevadm-monitor.c +++ b/udev/udevadm-monitor.c @@ -104,7 +104,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[]) " --env print the whole event environment\n" " --kernel print kernel uevents\n" " --udev print udev events\n" - " --help print this help text\n\n"); + " --help\n\n"); default: goto out; } diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c index 8976c9a16..f9e6415a0 100644 --- a/udev/udevadm-settle.c +++ b/udev/udevadm-settle.c @@ -80,7 +80,12 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) quiet = 1; break; case 'h': - printf("Usage: udevadm settle [--help] [--timeout=] [--quiet]\n\n"); + printf("Usage: udevadm settle OPTIONS\n" + " --timeout= maximum time to wait for events\n" + " --seq-start= first seqnum to wait for\n" + " --seq-end= last seqnum to wait for\n" + " --quiet do not print list after timeout\n" + " --help\n\n"); goto exit; } } diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c index 9d505146c..664d72f6d 100644 --- a/udev/udevadm-test.c +++ b/udev/udevadm-test.c @@ -64,7 +64,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[]) case 'h': printf("Usage: udevadm test OPTIONS \n" " --action= set action string\n" - " --help print this help text\n\n"); + " --help\n\n"); exit(0); default: exit(1); diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c index e475e4094..c88534600 100644 --- a/udev/udevadm-trigger.c +++ b/udev/udevadm-trigger.c @@ -180,8 +180,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[]) " --subsystem-nomatch= exclude devices from a matching subystem\n" " --attr-match=]> trigger devices with a matching attribute\n" " --attr-nomatch=]> exclude devices with a matching attribute\n" - " --help print this text\n" - "\n"); + " --help\n\n"); goto exit; default: goto exit; diff --git a/udev/udevadm.xml b/udev/udevadm.xml index 9d905abd0..1092498a4 100644 --- a/udev/udevadm.xml +++ b/udev/udevadm.xml @@ -224,6 +224,18 @@ and always return immediately. + + + + Wait only for events after the given sequence number. + + + + + + Wait only for events before the given sequence number. + + -- 2.30.2