morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

udevadm trigger: make --action option support all possible actions

Browse Source 
This also make udevadm abort operations if invalid action is specified.
This commit is contained in:
Yu Watanabe
2019-03-07 14:43:33 +09:00
parent 08caaee0ac
commit dcee4a134c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@
#include "sd-event.h"
#include "device-enumerator-private.h"
#include "device-private.h"
#include "fd-util.h"
#include "fileio.h"
#include "path-util.h"
@@ -199,11 +200,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 (STR_IN_SET(optarg, "add", "remove", "change"))
action = optarg;
else
log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown action '%s'", optarg);
if (device_action_from_string(optarg) < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown action '%s'", optarg);
action = optarg;
break;
case 's':
r = sd_device_enumerator_add_match_subsystem(e, optarg, true);