shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

Merge pull request #12908 from yuwata/udevadm-completion-action

Browse Source 
udevadm: support special value 'help' for --action option
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-06-29 16:22:22 +02:00 committed by GitHub
commit 3b88d21e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/udevadm.xml
View File

@ -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>

4
shell-completion/bash/udevadm
View File

@ -119,7 +119,7 @@ _udevadm() {
comps='devices subsystems'
;;
-c|--action)
comps='add change remove bind unbind'
comps=$( udevadm trigger --action help )
;;
-y|--sysname-match|-b|--parent-match)
comps=$( __get_all_sysdevs )
@ -196,7 +196,7 @@ _udevadm() {
if __contains_word "$prev" ${OPTS[TEST]}; then
case $prev in
-a|--action)
comps='add change remove bind unbind'
comps=$( udevadm test --action help )
;;
-N|--resolve-names)
comps='early late never'

4
src/libsystemd/sd-device/device-private.c
View File

@ -998,3 +998,7 @@ static const char* const device_action_table[_DEVICE_ACTION_MAX] = {
};
DEFINE_STRING_TABLE_LOOKUP(device_action, DeviceAction);
void dump_device_action_table(void) {
DUMP_STRING_TABLE(device_action, DeviceAction, _DEVICE_ACTION_MAX);
}

1
src/libsystemd/sd-device/device-private.h
View File

@ -75,3 +75,4 @@ static inline int device_read_db(sd_device *device) {
DeviceAction device_action_from_string(const char *s) _pure_;
const char *device_action_to_string(DeviceAction a) _const_;
void dump_device_action_table(void);

7
src/udev/udevadm-test.c
View File

@ -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),

6
src/udev/udevadm-trigger.c
View File

@ -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);