From 2410242aa4d21335026d3b90116078c9146a32f3 Mon Sep 17 00:00:00 2001 From: "trini@kernel.crashing.org" Date: Wed, 11 Aug 2004 01:02:59 -0700 Subject: [PATCH] fix UDEV_NO_SLEEP Move setting UDEV_NO_SLEEP into main(). I thought about moving udev_init_config() around, but it still must be invoked in both udev and udevstart cases, and before udev_hotplug() is called. An alternative would be to have main() do: if (is_udevstart) { ... current ... } else { udev_init_config(); return udev_hotplug(); } And move setting UDEV_NO_SLEEP into udev_start(). I can redo it that way, if you prefer. Signed-off-by: Tom Rini Signed-off-by: Greg Kroah-Hartman --- udev.c | 5 ++++- udevstart.c | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/udev.c b/udev.c index 0ef4cf8657..90c34d800a 100644 --- a/udev.c +++ b/udev.c @@ -174,8 +174,11 @@ int main(int argc, char *argv[], char *envp[]) main_argv = argv; main_envp = envp; - if (strstr(argv[0], "udevstart")) + if (strstr(argv[0], "udevstart")) { + /* Setup env variables. */ + setenv("UDEV_NO_SLEEP", "1", 1); is_udevstart = 1; + } /* initialize our configuration */ udev_init_config(); diff --git a/udevstart.c b/udevstart.c index d94c9501c9..2d5553e955 100644 --- a/udevstart.c +++ b/udevstart.c @@ -75,9 +75,6 @@ static int device_list_insert(char *path, char *subsystem, struct list_head *dev static void udev_exec(const char *path, const char* subsystem) { - /* Setup env variables. */ - setenv("UDEV_NO_SLEEP", "1", 1); - /* Now call __udev_hotplug(). */ if (__udev_hotplug("add", path, subsystem)) { dbg("Calling of udev_hotplug failed"); -- cgit v1.2.3-54-g00ecf