diff options
| author | Greg KH <greg@press.(none)> | 2005-06-21 16:36:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 16:36:29 -0700 |
| commit | 972d318a3123b00d0ed6b78bbcf70a0965841a8e (patch) | |
| tree | 8322245ad8e488ad3da9575e2d90b219a99880ea /udev.h | |
| parent | ae8d5e161fe916e39f226ce53f2c5f8b31f582a0 (diff) | |
| parent | d27d3bb05288fb5e70bc3f3fc7da1dc8ee5413a8 (diff) | |
Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
Diffstat (limited to 'udev.h')
| -rw-r--r-- | udev.h | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -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 { @@ -62,13 +56,19 @@ struct udevice { 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; char tmp_node[PATH_SIZE]; int partitions; @@ -87,7 +87,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]; @@ -97,7 +96,5 @@ extern char udev_config_filename[PATH_SIZE]; extern char udev_rules_filename[PATH_SIZE]; extern int udev_log_priority; extern int udev_run; -extern int udev_dev_d; -extern int udev_hotplug_d; #endif |