From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 7 Mar 2009 01:32:40 +0000 (+0100)
Subject: udevadm: add text for new options to command and man page
X-Git-Tag: 174~1131
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1e7e360465acc7fb038e941c398216cdb569253;p=systemd

udevadm: add text for new options to command and man page
---

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index b9892eca..f20eb07e 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 14a6edc8..77d98fac 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 8976c9a1..f9e6415a 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 9d505146..664d72f6 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 e475e409..c8853460 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 9d905abd..1092498a 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -224,6 +224,18 @@
                 and always return immediately.</para>
               </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>