X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.h;h=bfcb3f23d5c9dec88042aaa7d5faff9b551ea648;hp=959524a802fc48bdd7ac8fc5fb8835857822a72c;hb=761e5b476f8e69f41958a62ed787f5d886fa212e;hpb=b2fe4b9ac96c254efa68d747bfb9843c438919a0

diff --git a/udev_rules.h b/udev_rules.h
index 959524a80..bfcb3f23d 100644
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -54,7 +54,16 @@ struct key_pairs {
 	struct key_pair keys[PAIRS_MAX];
 };
 
+enum import_type {
+	IMPORT_UNSET,
+	IMPORT_PROGRAM,
+	IMPORT_FILE,
+	IMPORT_PARENT,
+};
+
 struct udev_rule {
+	struct key label;
+	struct key goto_label;
 	struct key kernel_name;
 	struct key subsystem;
 	struct key action;
@@ -66,6 +75,7 @@ struct udev_rule {
 	struct key result;
 	struct key modalias;
 	struct key import;
+	enum import_type import_type;
 	struct key wait_for_sysfs;
 	struct key_pairs sysfs;
 	struct key_pairs env;
@@ -81,8 +91,7 @@ struct udev_rule {
 	unsigned int partitions;
 	unsigned int last_rule:1,
 		     ignore_device:1,
-		     ignore_remove:1,
-		     import_exec:1;
+		     ignore_remove:1;
 
 	size_t bufsize;
 	char buf[];
@@ -101,8 +110,11 @@ extern void udev_rules_close(struct udev_rules *rules);
 
 extern void udev_rules_iter_init(struct udev_rules *rules);
 extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules);
+extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *label);
 
-extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct sysfs_class_device *class_dev);
-extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev, struct sysfs_device *sysfs_device);
+extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev,
+			       struct sysfs_class_device *class_dev);
+extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev,
+			      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_dev);
 
 #endif