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] udev_volume_id: version 27
[elogind.git]
/
namedev.h
diff --git
a/namedev.h
b/namedev.h
index 7a98d66c24ca42c2b5f964c2751c6eac8610ab8d..8a3569ec7cd92cd43d9e2712677c1ecdc69b3fa7 100644
(file)
--- a/
namedev.h
+++ b/
namedev.h
@@
-52,20
+52,12
@@
struct sysfs_class_device;
#define FIELD_MODE "MODE"
#define ATTR_PARTITIONS "all_partitions"
#define FIELD_MODE "MODE"
#define ATTR_PARTITIONS "all_partitions"
+#define ATTR_IGNORE_REMOVE "ignore_remove"
#define PARTITIONS_COUNT 15
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_SUFFIX ".rules"
#define PARTITIONS_COUNT 15
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_SUFFIX ".rules"
-#define PERMFILE_SUFFIX ".permissions"
-
-#define set_empty_perms(dev, m, o, g) \
- if (dev->mode == 0) \
- dev->mode = m; \
- if (dev->owner[0] == '\0') \
- strfieldcpy(dev->owner, o); \
- if (dev->group[0] == '\0') \
- strfieldcpy(dev->group, g);
struct sysfs_pair {
char file[FILE_SIZE];
struct sysfs_pair {
char file[FILE_SIZE];
@@
-86,34
+78,21
@@
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[
OWN
ER_SIZE];
- char group[
GROUP
_SIZE];
-
unsigned in
t mode;
+ char owner[
US
ER_SIZE];
+ char group[
USER
_SIZE];
+
mode_
t mode;
int partitions;
int partitions;
+ 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[OWNER_SIZE];
- char group[GROUP_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 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