X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevstart.c;h=5f3ba711f0303deffaa1a5dc160ecdbd9d114597;hb=cfb7ac2b5b3ff38cd9be8a515eaa31696cca7941;hp=4ef92fd537cc3dde1521f13c1dbd698f370397cd;hpb=8bd41f36f793f7fc208ef6beb4b2b84e35a5e728;p=elogind.git

diff --git a/udevstart.c b/udevstart.c
index 4ef92fd53..5f3ba711f 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -2,10 +2,12 @@
  * udevstart.c
  *
  * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
- * 
+ * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+ *
  * Quick and dirty way to populate a /dev with udev if your system
- * does not have access to a shell.  Based originally on a patch to udev 
- * from Harald Hoyer <harald@redhat.com>
+ * does not have access to a shell.  Based originally on a patch
+ * from:
+ *	Harald Hoyer <harald@redhat.com>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -41,8 +43,8 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "udev_rules.h"
 #include "udev_utils.h"
+#include "udev_rules.h"
 #include "list.h"
 
 static const char *udev_run_str;
@@ -158,8 +160,12 @@ run:
 		struct name_entry *name_loop;
 
 		dbg("executing run list");
-		list_for_each_entry(name_loop, &udev.run_list, node)
-			execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+		list_for_each_entry(name_loop, &udev.run_list, node) {
+			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
+				pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, "add");
+			else
+				execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+		}
 	}
 exit:
 	sysfs_close_class_device(class_dev);
@@ -359,7 +365,7 @@ int main(int argc, char *argv[], char *envp[])
 	sigaction(SIGTERM, &act, NULL);
 
 	/* trigger timeout to prevent hanging processes */
-	alarm(ALARM_TIMEOUT);
+	alarm(UDEV_ALARM_TIMEOUT);
 
 	udev_rules_init(&rules, 1);