X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=391dc2c41c06860c55c625979c358cc6601a27ca;hp=6e41bb5d26770d288d1e522b3a76454be7eb6d39;hb=78e21e3ed4a038a8aa358eb109b6029ca9c3cdd1;hpb=e6764498e7592f216a1895eacc485448fa4a1660

diff --git a/udev.h b/udev.h
index 6e41bb5d2..391dc2c41 100644
--- a/udev.h
+++ b/udev.h
@@ -29,9 +29,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 
-#define ALARM_TIMEOUT			120
 #define COMMENT_CHARACTER		'#'
-
 #define LINE_SIZE			512
 #define NAME_SIZE			128
 #define PATH_SIZE			256
@@ -39,13 +37,8 @@
 #define SEQNUM_SIZE			32
 #define VALUE_SIZE			128
 
-#define DEVD_DIR			"/etc/dev.d"
-#define DEVD_SUFFIX			".dev"
-
-#define HOTPLUGD_DIR			"/etc/hotplug.d"
-#define HOTPLUG_SUFFIX			".hotplug"
-
 #define DEFAULT_PARTITIONS_COUNT	15
+#define UDEV_ALARM_TIMEOUT		120
 
 enum device_type {
 	DEV_UNKNOWN,
@@ -58,18 +51,27 @@ enum device_type {
 struct udevice {
 	char devpath[PATH_SIZE];
 	char subsystem[NAME_SIZE];
+	char action[NAME_SIZE];
 
 	enum device_type type;
 	char name[PATH_SIZE];
 	char devname[PATH_SIZE];
 	struct list_head symlink_list;
+	int symlink_final;
 	char owner[USER_SIZE];
+	int owner_final;
 	char group[USER_SIZE];
+	int group_final;
 	mode_t mode;
+	int mode_final;
 	dev_t devt;
+	struct list_head run_list;
+	int run_final;
+	struct list_head env_list;
 
 	char tmp_node[PATH_SIZE];
 	int partitions;
+	int ignore_device;
 	int ignore_remove;
 	int config_line;
 	char config_file[PATH_SIZE];
@@ -84,7 +86,6 @@ extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *clas
 extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 extern int udev_start(void);
-extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 extern int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
 
 extern char sysfs_path[PATH_SIZE];
@@ -92,8 +93,7 @@ extern char udev_root[PATH_SIZE];
 extern char udev_db_path[PATH_SIZE];
 extern char udev_config_filename[PATH_SIZE];
 extern char udev_rules_filename[PATH_SIZE];
-extern int udev_log;
-extern int udev_dev_d;
-extern int udev_hotplug_d;
+extern int udev_log_priority;
+extern int udev_run;
 
 #endif