[PATCH] let udev act as udevstart if argv[1] == "udevstart"

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 70de729f30033c7a92f94013e343011703f96f64..1cf4ad7eae988893029ed7d784c3aa7b144fdcbe 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -26,7 +26,7 @@
 #include <sys/param.h>
 #include "libsysfs/sysfs/libsysfs.h"
 
-#define ALARM_TIMEOUT                  30
+#define ALARM_TIMEOUT                  120
 #define COMMENT_CHARACTER              '#'
 
 #define NAME_SIZE                      256
@@ -41,31 +41,27 @@
 
 #define LINE_SIZE                      256
 
-/* length of public data to store in udevdb */
-#define UDEVICE_DB_LEN (offsetof(struct udevice, devpath))
-
 struct udevice {
+       char devpath[DEVPATH_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
        char type;
        int major;
        int minor;
-       unsigned int mode;      /* not mode_t due to conflicting definitions in different libcs */
+       mode_t mode;
        char symlink[NAME_SIZE];
        int partitions;
        int config_line;
        char config_file[NAME_SIZE];
        long config_uptime;
-
-       /* private data, not stored in udevdb */
-       char devpath[DEVPATH_SIZE];
-       char subsystem[SUBSYSTEM_SIZE];
        char bus_id[SYSFS_NAME_LEN];
        char bus[SYSFS_NAME_LEN];
        char program_result[NAME_SIZE];
        char kernel_number[NAME_SIZE];
        char kernel_name[NAME_SIZE];
+       char devname[NAME_SIZE];
        int test_run;
 };
 
@@ -74,13 +70,13 @@ extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 extern int udev_start(void);
 extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern void dev_d_send(struct udevice *udev);
+extern void dev_d_execute(struct udevice *udev);
 
 extern char **main_argv;
 extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
 extern char udev_root[PATH_MAX];
-extern char udev_db_filename[PATH_MAX+NAME_MAX];
+extern char udev_db_path[PATH_MAX+NAME_MAX];
 extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
 extern char udev_config_filename[PATH_MAX+NAME_MAX];
 extern char udev_rules_filename[PATH_MAX+NAME_MAX];