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

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index b9892eca05bb1b33585c2e00a856e13128bfd082..f20eb07e046bd462f576c45967746e21f368428c 100644 (file)
--- 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 14a6edc84465fc7c32b295a4c33342fc0b21f76c..77d98facd5cff1f1f8b999d631f1df4905ab8ed6 100644 (file)
--- 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 8976c9a16bde9e69df1ced477c3b0c0b0bb0bdc7..f9e6415a00abbb413ee66d5881359e768f9aebe7 100644 (file)
--- 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 9d505146cf851a5c5fd3dab942372ca90e0d2c34..664d72f6d3484e58758c410e33d3713576dcbea8 100644 (file)
--- 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 e475e409495fdacd209c9d7e4274e3181b39829d..c88534600d78811408ce721757d4ddb88422e1cf 100644 (file)
--- 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 9d905abd0c9d34806e0e91844dda2d2c38b24849..1092498a4645682b2f66fc27644903692c92336a 100644 (file)
--- 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>