rules: do not preprocess 60-persistent-storage.rules

[elogind.git] / udev / udevadm-trigger.c

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 03aa53437f17a034f2ebb8a2a8e6232702a54efa..2cee2297d4940aa514ac69d23c5b7a24aec5bf05 100644 (file)
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -61,20 +61,6 @@ static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
        }
 }
 
-static int scan_failed(struct udev_enumerate *udev_enumerate)
-{
-       struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
-       struct udev_queue *udev_queue;
-       struct udev_list_entry *list_entry;
-
-       udev_queue = udev_queue_new(udev);
-       if (udev_queue == NULL)
-               return -1;
-       udev_list_entry_foreach(list_entry, udev_queue_get_failed_list_entry(udev_queue))
-               udev_enumerate_add_syspath(udev_enumerate, udev_list_entry_get_name(list_entry));
-       return 0;
-}
-
 static const char *keyval(const char *str, const char **val, char *buf, size_t size)
 {
        char *pos;
@@ -89,7 +75,7 @@ static const char *keyval(const char *str, const char **val, char *buf, size_t s
        return buf;
 }
 
-int udevadm_trigger(struct udev *udev, int argc, char *argv[])
+static int adm_trigger(struct udev *udev, int argc, char *argv[])
 {
        static const struct option options[] = {
                { "verbose", no_argument, NULL, 'v' },
@@ -101,14 +87,15 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                { "attr-match", required_argument, NULL, 'a' },
                { "attr-nomatch", required_argument, NULL, 'A' },
                { "property-match", required_argument, NULL, 'p' },
+               { "tag-match", required_argument, NULL, 'g' },
                { "sysname-match", required_argument, NULL, 'y' },
+               { "parent-match", required_argument, NULL, 'b' },
                { "help", no_argument, NULL, 'h' },
                {}
        };
        enum {
                TYPE_DEVICES,
                TYPE_SUBSYSTEMS,
-               TYPE_FAILED,
        } device_type = TYPE_DEVICES;
        const char *action = "change";
        struct udev_enumerate *udev_enumerate;
@@ -121,13 +108,13 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                goto exit;
        }
 
-       while (1) {
+       for (;;) {
                int option;
                const char *key;
                const char *val;
                char buf[UTIL_PATH_SIZE];
 
-               option = getopt_long(argc, argv, "vnFo:t:hcp:s:S:a:A:y:", options, NULL);
+               option = getopt_long(argc, argv, "vng:o:t:hc:p:s:S:a:A:y:b:", options, NULL);
                if (option == -1)
                        break;
 
@@ -143,8 +130,6 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                                device_type = TYPE_DEVICES;
                        } else if (strcmp(optarg, "subsystems") == 0) {
                                device_type = TYPE_SUBSYSTEMS;
-                       } else if (strcmp(optarg, "failed") == 0) {
-                               device_type = TYPE_FAILED;
                        } else {
                                err(udev, "unknown type --type=%s\n", optarg);
                                rc = 2;
@@ -172,9 +157,33 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                        key = keyval(optarg, &val, buf, sizeof(buf));
                        udev_enumerate_add_match_property(udev_enumerate, key, val);
                        break;
+               case 'g':
+                       udev_enumerate_add_match_tag(udev_enumerate, optarg);
+                       break;
                case 'y':
                        udev_enumerate_add_match_sysname(udev_enumerate, optarg);
                        break;
+               case 'b': {
+                       char path[UTIL_PATH_SIZE];
+                       struct udev_device *dev;
+
+                       /* add sys dir if needed */
+                       if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0)
+                               util_strscpyl(path, sizeof(path), udev_get_sys_path(udev), optarg, NULL);
+                       else
+                               util_strscpy(path, sizeof(path), optarg);
+                       util_remove_trailing_chars(path, '/');
+                       dev = udev_device_new_from_syspath(udev, path);
+                       if (dev == NULL) {
+                               err(udev, "unable to open the device '%s'\n", optarg);
+                               rc = 2;
+                               goto exit;
+                       }
+                       udev_enumerate_add_match_parent(udev_enumerate, dev);
+                       /* drop reference immediately, enumerate pins the device as long as needed */
+                       udev_device_unref(dev);
+                       break;
+               }
                case 'h':
                        printf("Usage: udevadm trigger OPTIONS\n"
                               "  --verbose                       print the list of devices while running\n"
@@ -182,27 +191,24 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                               "  --type=                         type of events to trigger\n"
                               "      devices                       sys devices (default)\n"
                               "      subsystems                    sys subsystems and drivers\n"
-                              "      failed                        trigger only the events which have been\n"
-                              "                                    marked as failed during a previous run\n"
                               "  --action=<action>               event action value, default is \"change\"\n"
                               "  --subsystem-match=<subsystem>   trigger devices from a matching subsystem\n"
                               "  --subsystem-nomatch=<subsystem> exclude devices from a matching subsystem\n"
                               "  --attr-match=<file[=<value>]>   trigger devices with a matching attribute\n"
                               "  --attr-nomatch=<file[=<value>]> exclude devices with a matching attribute\n"
                               "  --property-match=<key>=<value>  trigger devices with a matching property\n"
+                              "  --tag-match=<key>=<value>       trigger devices with a matching property\n"
                               "  --sysname-match=<name>          trigger devices with a matching name\n"
+                              "  --parent-match=<name>           trigger devices with that parent device\n"
                               "  --help\n\n");
                        goto exit;
                default:
+                       rc = 1;
                        goto exit;
                }
        }
 
        switch (device_type) {
-       case TYPE_FAILED:
-               scan_failed(udev_enumerate);
-               exec_list(udev_enumerate, action);
-               goto exit;
        case TYPE_SUBSYSTEMS:
                udev_enumerate_scan_subsystems(udev_enumerate);
                exec_list(udev_enumerate, action);
@@ -218,3 +224,9 @@ exit:
        udev_enumerate_unref(udev_enumerate);
        return rc;
 }
+
+const struct udevadm_cmd udevadm_trigger = {
+       .name = "trigger",
+       .cmd = adm_trigger,
+       .help = "request events from the kernel",
+};