diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-28 21:03:06 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-28 21:10:14 +0200 |
| commit | 6d22bd87f0d9505721dfa0ec5ae94f39a1691526 (patch) | |
| tree | 8a9902298772a257d738cbda71b2b6761477e5eb | |
| parent | sd-device: introduce dump_device_action_table() (diff) | |
| download | systemd-6d22bd87f0d9505721dfa0ec5ae94f39a1691526.tar.xz systemd-6d22bd87f0d9505721dfa0ec5ae94f39a1691526.zip | |
udevadm: support special value 'help' for --action option
| -rw-r--r-- | man/udevadm.xml | 9 | ||||
| -rw-r--r-- | src/udev/udevadm-test.c | 7 | ||||
| -rw-r--r-- | src/udev/udevadm-trigger.c | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/man/udevadm.xml b/man/udevadm.xml index 396d418f83..d12c39b765 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -228,7 +228,9 @@ <para>Type of event to be triggered. Possible actions are <literal>add</literal>, <literal>remove</literal>, <literal>change</literal>, <literal>move</literal>, <literal>online</literal>, <literal>offline</literal>, <literal>bind</literal>, - and <literal>unbind</literal>. The default value is <literal>change</literal>.</para> + and <literal>unbind</literal>. Also, the special value <literal>help</literal> can be used + to list the possible actions. The default value is <literal>change</literal>. + </para> </listitem> </varlistentry> <varlistentry> @@ -524,9 +526,10 @@ <variablelist> <varlistentry> <term><option>-a</option></term> - <term><option>--action=<replaceable>string</replaceable></option></term> + <term><option>--action=<replaceable>ACTION</replaceable></option></term> <listitem> - <para>The action string.</para> + <para>The action string. The special value <literal>help</literal> may be used to list + known values.</para> </listitem> </varlistentry> <varlistentry> diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c index 8124951422..7ad9993f09 100644 --- a/src/udev/udevadm-test.c +++ b/src/udev/udevadm-test.c @@ -33,7 +33,7 @@ static int help(void) { "Test an event run.\n\n" " -h --help Show this help\n" " -V --version Show package version\n" - " -a --action=ACTION Set action string\n" + " -a --action=ACTION|help Set action string\n" " -N --resolve-names=early|late|never When to resolve names\n" , program_invocation_short_name); @@ -56,6 +56,11 @@ static int parse_argv(int argc, char *argv[]) { case 'a': { DeviceAction a; + if (streq(optarg, "help")) { + dump_device_action_table(); + return 0; + } + a = device_action_from_string(optarg); if (a < 0) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index f14010a2d0..77d95e513f 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -115,7 +115,7 @@ static int help(void) { " -t --type= Type of events to trigger\n" " devices sysfs devices (default)\n" " subsystems sysfs subsystems and drivers\n" - " -c --action=ACTION Event action value, default is \"change\"\n" + " -c --action=ACTION|help Event action value, default is \"change\"\n" " -s --subsystem-match=SUBSYSTEM Trigger devices from a matching subsystem\n" " -S --subsystem-nomatch=SUBSYSTEM Exclude devices from a matching subsystem\n" " -a --attr-match=FILE[=VALUE] Trigger devices with a matching attribute\n" @@ -205,6 +205,10 @@ int trigger_main(int argc, char *argv[], void *userdata) { return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown type --type=%s", optarg); break; case 'c': + if (streq(optarg, "help")) { + dump_device_action_table(); + return 0; + } if (device_action_from_string(optarg) < 0) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown action '%s'", optarg); |