chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] add ENV{} key to match agains environment variables
[elogind.git]
/
udev_rules.h
diff --git
a/udev_rules.h
b/udev_rules.h
index 688d4798e16650120469f843e479794afa0fc745..423a6f641ecb1f24632c4c5eeeecc595caf0e44a 100644
(file)
--- a/
udev_rules.h
+++ b/
udev_rules.h
@@
-31,11
+31,12
@@
#define KEY_KERNEL "KERNEL"
#define KEY_SUBSYSTEM "SUBSYSTEM"
#define KEY_BUS "BUS"
#define KEY_KERNEL "KERNEL"
#define KEY_SUBSYSTEM "SUBSYSTEM"
#define KEY_BUS "BUS"
-#define KEY_SYSFS "SYSFS"
#define KEY_ID "ID"
#define KEY_PROGRAM "PROGRAM"
#define KEY_RESULT "RESULT"
#define KEY_DRIVER "DRIVER"
#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_NAME "NAME"
#define KEY_SYMLINK "SYMLINK"
#define KEY_OWNER "OWNER"
#define KEY_NAME "NAME"
#define KEY_SYMLINK "SYMLINK"
#define KEY_OWNER "OWNER"
@@
-48,7
+49,8
@@
#define OPTION_IGNORE_REMOVE "ignore_remove"
#define OPTION_PARTITIONS "all_partitions"
#define OPTION_IGNORE_REMOVE "ignore_remove"
#define OPTION_PARTITIONS "all_partitions"
-#define MAX_SYSFS_PAIRS 5
+#define KEY_SYSFS_PAIRS_MAX 5
+#define KEY_ENV_PAIRS_MAX 5
#define RULEFILE_SUFFIX ".rules"
#define RULEFILE_SUFFIX ".rules"
@@
-60,8
+62,8
@@
enum key_operation {
KEY_OP_ASSIGN,
};
KEY_OP_ASSIGN,
};
-struct
sysfs
_pair {
- char
file[PATH
_SIZE];
+struct
key
_pair {
+ char
name[NAME
_SIZE];
char value[VALUE_SIZE];
enum key_operation operation;
};
char value[VALUE_SIZE];
enum key_operation operation;
};
@@
-83,7
+85,10
@@
struct udev_rule {
enum key_operation program_operation;
char result[PATH_SIZE];
enum key_operation result_operation;
enum key_operation program_operation;
char result[PATH_SIZE];
enum key_operation result_operation;
- struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+ struct key_pair sysfs_pair[KEY_SYSFS_PAIRS_MAX];
+ int sysfs_pair_count;
+ struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
+ int env_pair_count;
char name[PATH_SIZE];
char symlink[PATH_SIZE];
char name[PATH_SIZE];
char symlink[PATH_SIZE];