summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-03-07 02:32:40 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-03-07 02:32:40 +0100
commitf1e7e360465acc7fb038e941c398216cdb569253 (patch)
tree7e302faa6b95d3e4469544c308eccf5e6782d8fb
parent18e3d9abc3a0bc57c2f4d45705308e7dc3a60fab (diff)
udevadm: add text for new options to command and man page
-rw-r--r--udev/udevadm-info.c3
-rw-r--r--udev/udevadm-monitor.c2
-rw-r--r--udev/udevadm-settle.c7
-rw-r--r--udev/udevadm-test.c2
-rw-r--r--udev/udevadm-trigger.c3
-rw-r--r--udev/udevadm.xml12
6 files changed, 22 insertions, 7 deletions
diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index b9892eca05..f20eb07e04 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=<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 14a6edc844..77d98facd5 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 8976c9a16b..f9e6415a00 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=<seconds>] [--quiet]\n\n");
+ printf("Usage: udevadm settle OPTIONS\n"
+ " --timeout=<seconds> maximum time to wait for events\n"
+ " --seq-start=<seqnum> first seqnum to wait for\n"
+ " --seq-end=<seqnum> 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 9d505146cf..664d72f6d3 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 <syspath>\n"
" --action=<string> 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 e475e40949..c88534600d 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=<subsystem> exclude devices from a matching subystem\n"
" --attr-match=<file[=<value>]> trigger devices with a matching attribute\n"
" --attr-nomatch=<file[=<value>]> 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 9d905abd0c..1092498a46 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -225,6 +225,18 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><option>--seq-start=<replaceable>seqnum</replaceable></option></term>
+ <listitem>
+ <para>Wait only for events after the given sequence number.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--seq-end=<replaceable>seqnum</replaceable></option></term>
+ <listitem>
+ <para>Wait only for events before the given sequence number.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>--quiet</option></term>
<listitem>
<para>Do not print any output, like the remaining queue entries when reaching the timeout.</para>