X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-trigger.c;h=d94c9568d1793aa8da64bd3311111410783b585c;hb=a13d90aec63db6b3d3b90da41b5274fd81ab790e;hp=03aa53437f17a034f2ebb8a2a8e6232702a54efa;hpb=236fae6cf1a619a92174efdf84cd7d91e7d4348d;p=elogind.git

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 03aa53437..d94c9568d 100644
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -89,7 +89,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,7 +101,9 @@ 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' },
 		{}
 	};
@@ -121,13 +123,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;
 
@@ -172,9 +174,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"
@@ -190,16 +216,20 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
 			       "  --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:
+		err(udev, "--type=failed is deprecated and will be removed from a future udev release.\n");
 		scan_failed(udev_enumerate);
 		exec_list(udev_enumerate, action);
 		goto exit;
@@ -218,3 +248,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",
+};