[PATCH] Fix naming ethernet devices in udevstart

On Tue, Sep 07, 2004 at 12:46:43PM +0200, Kay Sievers wrote:
> On Mon, 2004-09-06 at 20:18 -0700, Tom Rini wrote:
> > I noticed somewhat recently that my enet devices weren't being renamed
> > on boot anymore.  I don't quite know when this got broken (or rather, if
> > it was supposed to be working.  I swear it worked for me once..), but
> > the following seems to do it.
>
> I think it never worked in the udevstart case. It worked only with the
> hotplug-event-udev, I expect.
>
> > In udev_scan_class(), look for not just
> > %s/%s/dev (which everything with a dev node has), but %s/%s/dev* (both
> > of my enet devices, sis900 & 3c59x only have device) and if that
> > exists, pass this along to udev.
>
> Yeah, network devices don't have a devnode and therefore no "dev", but
> they are all in /sys/class/net/. We may just test if we are there
> instead of the "device" match.

How about something like this. It adds all the net devices without
looking at the attributes and keeps the remaining logic like it is.

It also removes certain levels of indirection and much simplifies the
udevstart process. We surely don't need to open and close the udevdb
for every node while iterating over the list. (We are about 5% faster on
my box)

It's not well tested, so it would be nice if someone can have a look
at it, before a broken udevstart renders any system unbootable.

4 files changed, 92 insertions, 101 deletions

diff --git a/udev.c b/udev.c
index 90c34d800a..114ca0a52b 100644
--- a/udev.c
+++ b/udev.c
@@ -40,9 +40,6 @@
 char **main_argv;
 char **main_envp;
 
-/* local variables */
-static int is_udevstart;
-
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
@@ -79,36 +76,72 @@ static char *subsystem_blacklist[] = {
 	""
 };
 
-int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
+int main(int argc, char *argv[], char *envp[])
 {
-	int retval = -EINVAL;
-	int i;
+	main_argv = argv;
+	main_envp = envp;
 	struct sigaction act;
-	const int nofake = 0;
+	char *action;
+	char *devpath = "";
+	char *subsystem = "";
+	int i;
+	int retval = -EINVAL;
+	enum {
+		ADD,
+		REMOVE,
+		UDEVSTART,
+	} act_type;
 
-	dbg("looking at '%s'", devpath);
+	dbg("version %s", UDEV_VERSION);
 
-	/* we only care about class devices and block stuff */
-	if (!strstr(devpath, "class") &&
-	    !strstr(devpath, "block")) {
-		dbg("not a block or class device");
-		goto exit;
-	}
+	/* initialize our configuration */
+	udev_init_config();
 
-	i = 0;
-	while (subsystem_blacklist[i][0] != '\0') {
-		if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
-			dbg("don't care about '%s' devices", subsystem);
+	if (strstr(argv[0], "udevstart")) {
+		act_type = UDEVSTART;
+	} else {
+		action = get_action();
+		if (!action) {
+			dbg("no action?");
+			goto exit;
+		}
+		if (strcmp(action, "add") == 0) {
+			act_type = ADD;
+		} else if (strcmp(action, "remove") == 0) {
+			act_type = REMOVE;
+		} else {
+			dbg("unknown action '%s'", action);
 			goto exit;
 		}
-		i++;
-	}
 
-	/* initialize udev database */
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("unable to initialize database");
-		goto exit;
+		devpath = get_devpath();
+		if (!devpath) {
+			dbg("no devpath?");
+			goto exit;
+		}
+		dbg("looking at '%s'", devpath);
+
+		/* we only care about class devices and block stuff */
+		if (strstr(devpath, "class") && strstr(devpath, "block")) {
+			dbg("not a block or class device");
+			goto exit;
+		}
+
+		subsystem = get_subsystem(main_argv[1]);
+		if (!subsystem) {
+			dbg("no subsystem?");
+			goto exit;
+		}
+
+		/* skip blacklisted subsystems */
+		i = 0;
+		while (subsystem_blacklist[i][0] != '\0') {
+			if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
+				dbg("don't care about '%s' devices", subsystem);
+				goto exit;
+			}
+			i++;
+		}
 	}
 
 	/* set signal handlers */
@@ -118,76 +151,31 @@ int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	if (strcmp(action, "add") == 0) {
-		/* Already done. */
-		if (!is_udevstart)
-			namedev_init();
-		retval = udev_add_device(devpath, subsystem, nofake);
-		goto action_done;
+	/* initialize udev database */
+	if (udevdb_init(UDEVDB_DEFAULT) != 0) {
+		dbg("unable to initialize database");
+		goto exit;
 	}
 
-	if (strcmp(action, "remove") == 0) {
+	switch(act_type) {
+	case UDEVSTART:
+		dbg("udevstart");
+		namedev_init();
+		udev_sleep = 0;
+		retval = udev_start();
+		break;
+	case ADD:
+		dbg("udev add");
+		namedev_init();
+		retval = udev_add_device(devpath, subsystem, NOFAKE);
+		break;
+	case REMOVE:
+		dbg("udev remove");
 		retval = udev_remove_device(devpath, subsystem);
-		goto action_done;
 	}
 
-	dbg("unknown action '%s'", action);
-	retval = -EINVAL;
-
-action_done:
 	udevdb_exit();
 
 exit:
 	return retval;
 }
-
-static int udev_hotplug(void)
-{
-	char *action;
-	char *devpath;
-	char *subsystem;
-
-	action = get_action();
-	if (!action) {
-		dbg("no action?");
-		return -EINVAL;
-	}
-
-	devpath = get_devpath();
-	if (!devpath) {
-		dbg("no devpath?");
-		return -EINVAL;
-	}
-
-	/* skip blacklisted subsystems */
-	subsystem = get_subsystem(main_argv[1]);
-	if (!subsystem) {
-		dbg("no subsystem?");
-		return -EINVAL;
-	}
-
-	return __udev_hotplug(action, devpath, subsystem);
-}
-
-int main(int argc, char *argv[], char *envp[])
-{
-	main_argv = argv;
-	main_envp = envp;
-
-	if (strstr(argv[0], "udevstart")) {
-		/* Setup env variables. */
-		setenv("UDEV_NO_SLEEP", "1", 1);
-		is_udevstart = 1;
-	}
-
-	/* initialize our configuration */
-	udev_init_config();
-
-	dbg("version %s", UDEV_VERSION);
-
-	if (is_udevstart) {
-		namedev_init();
-		return udev_start();
-	} else
-		return udev_hotplug();
-}
diff --git a/udev.h b/udev.h
index 7c5d18a3d0..d049fc1fd0 100644
--- a/udev.h
+++ b/udev.h
@@ -40,6 +40,9 @@
 
 #define LINE_SIZE			256
 
+#define FAKE				1
+#define NOFAKE				0
+
 /* length of public data */
 #define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
diff --git a/udevstart.c b/udevstart.c
index 2d5553e955..cb1c78888c 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -70,18 +70,10 @@ static int device_list_insert(char *path, char *subsystem, struct list_head *dev
 	strfieldcpy(new_device->path, path);
 	strfieldcpy(new_device->subsys, subsystem);
 	list_add_tail(&new_device->list, &loop_device->list);
+	dbg("add '%s' from subsys '%s'", new_device->path, new_device->subsys);
 	return 0;
 }
 
-static void udev_exec(const char *path, const char* subsystem)
-{
-	/* Now call __udev_hotplug(). */
-	if (__udev_hotplug("add", path, subsystem)) {
-		dbg("Calling of udev_hotplug failed");
-		exit(1);
-	}
-}
-
 /* list of devices that we should run last due to any one of a number of reasons */
 static char *last_list[] = {
 	"/block/dm",	/* on here because dm wants to have the block devices around before it */
@@ -106,14 +98,14 @@ static void exec_list(struct list_head *device_list)
 		if (found)
 			continue;
 
-		udev_exec(loop_device->path, loop_device->subsys);
+		udev_add_device(loop_device->path, loop_device->subsys, NOFAKE);
 		list_del(&loop_device->list);
 		free(loop_device);
 	}
 
 	/* handle the rest of the devices left over, if any */
 	list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
-		udev_exec(loop_device->path, loop_device->subsys);
+		udev_add_device(loop_device->path, loop_device->subsys, NOFAKE);
 		list_del(&loop_device->list);
 		free(loop_device);
 	}
@@ -209,19 +201,27 @@ static void udev_scan_class(void)
 					    (strcmp(dent2->d_name, "..") == 0))
 						continue;
 
+					/* pass the net class as it is */
+					if (strcmp(dent->d_name, "net") == 0) {
+						snprintf(dirname2, MAX_PATHLEN, "/class/net/%s", dent2->d_name);
+						device_list_insert(dirname2, "net", &device_list);
+						continue;
+					}
+
 					snprintf(dirname2, MAX_PATHLEN, "%s/%s", dirname, dent2->d_name);
 					dirname2[MAX_PATHLEN-1] = '\0';
-
 					dir3 = opendir(dirname2);
 					if (dir3 != NULL) {
 						for (dent3 = readdir(dir3); dent3 != NULL; dent3 = readdir(dir3)) {
 							char filename[MAX_PATHLEN];
 
+							/* pass devices with a "dev" file */
 							if (strcmp(dent3->d_name, "dev") == 0) {
 								snprintf(filename, MAX_PATHLEN, "/class/%s/%s",
 									 dent->d_name, dent2->d_name);
 								filename[MAX_PATHLEN-1] = '\0';
 								device_list_insert(filename, dent->d_name, &device_list);
+								break;
 							}
 						}
 						closedir(dir3);
diff --git a/udevtest.c b/udevtest.c
index 36f223e1e5..f24c7e4ba5 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[], char *envp[])
 		subsystem = argv[2];
 
 	/* simulate node creation with fake flag */
-	udev_add_device(devpath, subsystem, fake);
+	udev_add_device(devpath, subsystem, FAKE);
 
 exit:
 	return 0;