X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev_rules.h;h=fb77509cce541e32f1b1a0b10d24aae45cdc0740;hb=6369839195d7572151d986ddc2050162e6879585;hp=f4b0a6f12f7fbadea225e9b883209575ed0fc104;hpb=bd0ed2ffbec325512c3131ce0db896234e36c923;p=elogind.git

diff --git a/udev_rules.h b/udev_rules.h
index f4b0a6f12..fb77509cc 100644
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -27,33 +27,6 @@
 #include "udev.h"
 #include "list.h"
 
-
-#define KEY_KERNEL		"KERNEL"
-#define KEY_SUBSYSTEM		"SUBSYSTEM"
-#define KEY_ACTION		"ACTION"
-#define KEY_DEVPATH		"DEVPATH"
-#define KEY_BUS			"BUS"
-#define KEY_ID			"ID"
-#define KEY_PROGRAM		"PROGRAM"
-#define KEY_RESULT		"RESULT"
-#define KEY_DRIVER		"DRIVER"
-#define KEY_SYSFS		"SYSFS"
-#define KEY_ENV			"ENV"
-#define KEY_MODALIAS		"MODALIAS"
-#define KEY_IMPORT		"IMPORT"
-#define KEY_NAME		"NAME"
-#define KEY_SYMLINK		"SYMLINK"
-#define KEY_OWNER		"OWNER"
-#define KEY_GROUP		"GROUP"
-#define KEY_MODE		"MODE"
-#define KEY_RUN			"RUN"
-#define KEY_OPTIONS		"OPTIONS"
-
-#define OPTION_LAST_RULE	"last_rule"
-#define OPTION_IGNORE_DEVICE	"ignore_device"
-#define OPTION_IGNORE_REMOVE	"ignore_remove"
-#define OPTION_PARTITIONS	"all_partitions"
-
 #define KEY_SYSFS_PAIRS_MAX	5
 #define KEY_ENV_PAIRS_MAX	5
 
@@ -77,7 +50,7 @@ struct key_pair {
 struct udev_rule {
 	struct list_head node;
 
-	char kernel[NAME_SIZE];
+	char kernel_name[NAME_SIZE];
 	enum key_operation kernel_operation;
 	char subsystem[NAME_SIZE];
 	enum key_operation subsystem_operation;
@@ -99,10 +72,11 @@ struct udev_rule {
 	int sysfs_pair_count;
 	struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
 	int env_pair_count;
+	char modalias[NAME_SIZE];
 	enum key_operation modalias_operation;
-	char modalias[PATH_SIZE];
-	enum key_operation import_operation;
 	char import[PATH_SIZE];
+	enum key_operation import_operation;
+	int import_exec;
 
 	char name[PATH_SIZE];
 	enum key_operation name_operation;