X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=5fdd62d32335a85341c39355c531f7cabff58832;hp=e24bc28a78ccf24b91aef8fa36e7c2b8e7c8880e;hb=0e404ee1efdb941d1c287434abe1e56f571dc7ba;hpb=53921bfa44129a19661a4aaa4c1647282921fc18

diff --git a/udevd.h b/udevd.h
index e24bc28a7..5fdd62d32 100644
--- a/udevd.h
+++ b/udevd.h
@@ -24,26 +24,18 @@
 
 #include "list.h"
 
-/*
- * FIXME: udev_root is post compile configurable and may also be
- * mounted over at any time and /var/run/ and /tmp/ is unusable,
- * cause it's cleaned at system startup, long _after_ udevd is
- * already running. Should we use udev_init_config()?
- */
-
-#define UDEV_MAGIC			"udev_" UDEV_VERSION
-#define EVENT_TIMEOUT_SEC		5
+#define UDEV_MAGIC			"udevd_" UDEV_VERSION
+#define EVENT_TIMEOUT_SEC		10
 #define UDEVSEND_CONNECT_RETRY		20 /* x 100 millisec */
-#define UDEVD_SOCKET			UDEV_ROOT ".udevd.socket"
-#define UDEVD_LOCK			UDEV_ROOT ".udevd.pid"
+#define UDEVD_SOCK_PATH			"udevd"
 
 struct hotplug_msg {
 	char magic[20];
 	struct list_head list;
 	pid_t pid;
 	int seqnum;
-	time_t queue_time;
-	char action[8];
-	char devpath[128];
-	char subsystem[16];
+	long queue_time;
+	char action[ACTION_SIZE];
+	char devpath[DEVPATH_SIZE];
+	char subsystem[SUBSYSTEM_SIZE];
 };