[PATCH] callout part selector tweak

[elogind.git] / udevd.h

diff --git a/udevd.h b/udevd.h
index e24bc28a78ccf24b91aef8fa36e7c2b8e7c8880e..8b82ff9a7015ae19a85626cc644fc487bc153c21 100644 (file)
--- a/udevd.h
+++ b/udevd.h
@@ -24,18 +24,10 @@
 
 #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 UDEV_MAGIC                     "udevd_" UDEV_VERSION
 #define EVENT_TIMEOUT_SEC              5
 #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];
@@ -43,7 +35,7 @@ struct hotplug_msg {
        pid_t pid;
        int seqnum;
        time_t queue_time;
-       char action[8];
-       char devpath[128];
-       char subsystem[16];
+       char action[ACTION_SIZE];
+       char devpath[DEVPATH_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
 };