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] introduce OPTIONS=ignore_device, ignore_remove, all_partitions" key
[elogind.git]
/
namedev.h
diff --git
a/namedev.h
b/namedev.h
index e29279243bca829838408d00582984bf140c7123..1e1a9bbc3450013a7dafe306c3e965b9e637e3f2 100644
(file)
--- a/
namedev.h
+++ b/
namedev.h
@@
-50,15
+50,15
@@
struct sysfs_class_device;
#define FIELD_OWNER "OWNER"
#define FIELD_GROUP "GROUP"
#define FIELD_MODE "MODE"
#define FIELD_OWNER "OWNER"
#define FIELD_GROUP "GROUP"
#define FIELD_MODE "MODE"
+#define FIELD_OPTIONS "OPTIONS"
-#define ATTR_
PARTITIONS "all_partitions
"
+#define ATTR_
IGNORE_DEVICE "ignore_device
"
#define ATTR_IGNORE_REMOVE "ignore_remove"
#define ATTR_IGNORE_REMOVE "ignore_remove"
-#define
PARTITIONS_COUNT 15
+#define
ATTR_PARTITIONS "all_partitions"
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_SUFFIX ".rules"
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_SUFFIX ".rules"
-#define PERMFILE_SUFFIX ".permissions"
struct sysfs_pair {
char file[FILE_SIZE];
struct sysfs_pair {
char file[FILE_SIZE];
@@
-79,35
+79,26
@@
struct config_device {
char name[NAME_SIZE];
char symlink[NAME_SIZE];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
char name[NAME_SIZE];
char symlink[NAME_SIZE];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+
char owner[USER_SIZE];
char group[USER_SIZE];
mode_t mode;
char owner[USER_SIZE];
char group[USER_SIZE];
mode_t mode;
+
int partitions;
int partitions;
+ int ignore_device;
int ignore_remove;
int ignore_remove;
+
char config_file[NAME_SIZE];
int config_line;
};
char config_file[NAME_SIZE];
int config_line;
};
-struct perm_device {
- struct list_head node;
-
- char name[NAME_SIZE];
- char owner[USER_SIZE];
- char group[USER_SIZE];
- unsigned int mode;
-};
-
extern struct list_head config_device_list;
extern struct list_head config_device_list;
-extern struct list_head perm_device_list;
extern int namedev_init(void);
extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
extern int namedev_init(void);
extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
-extern int namedev_init_permissions(void);
-extern int namedev_init_rules(void);
+extern void namedev_close(void);
extern void dump_config_dev(struct config_device *dev);
extern void dump_config_dev_list(void);
extern void dump_config_dev(struct config_device *dev);
extern void dump_config_dev_list(void);
-extern void dump_perm_dev(struct perm_device *dev);
-extern void dump_perm_dev_list(void);
#endif
#endif