add -x to scsi_id to export the queried values in env format

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index c2706f4593ad36640ef50dea2f5a2f9b46bb92f1..b5287bb53fd679e59c02bc81d72cc6b37ecb1ac5 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -39,12 +39,6 @@
 #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
 
 enum device_type {
@@ -58,18 +52,28 @@ 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];
+       int name_set;
        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 +88,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];
@@ -93,7 +96,6 @@ 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_priority;
-extern int udev_dev_d;
-extern int udev_hotplug_d;
+extern int udev_run;
 
 #endif