X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevd.c;h=ec6ee009cd39158a80a294a25a240e227bf02e62;hb=e3196993f1f7fdd9fb7fbf4eeb397080554ae920;hp=d1a226673e6df8244ce8e5bbb071539ccb84657d;hpb=540f46698dd5a3bed767fa1c761ead1c9e41ed2e;p=elogind.git

diff --git a/udev/udevd.c b/udev/udevd.c
index d1a226673..ec6ee009c 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -339,7 +339,7 @@ static int compare_devpath(const char *running, const char *waiting)
 	return 0;
 }
 
-/* lookup event for identical, parent, child, or physical device */
+/* lookup event for identical, parent, child device */
 static int devpath_busy(struct udev_event *event)
 {
 	struct udev_list_node *loop;
@@ -390,19 +390,6 @@ static int devpath_busy(struct udev_event *event)
 			event->delaying_seqnum = udev_device_get_seqnum(loop_event->dev);
 			return 5;
 		}
-
-		/* check physical device event (special case of parent) */
-		if (udev_device_get_physdevpath(event->dev) != NULL &&
-		    strcmp(udev_device_get_action(event->dev), "add") == 0)
-			if (compare_devpath(udev_device_get_devpath(loop_event->dev),
-					    udev_device_get_physdevpath(event->dev)) != 0) {
-				dbg(event->udev, "%llu, physical device event still pending %llu (%s)\n",
-				    udev_device_get_seqnum(event->dev),
-				    udev_device_get_seqnum(loop_event->dev),
-				    udev_device_get_devpath(loop_event->dev));
-				event->delaying_seqnum = udev_device_get_seqnum(loop_event->dev);
-				return 6;
-			}
 	}
 	return 0;
 }
@@ -708,28 +695,6 @@ static void export_initial_seqnum(struct udev *udev)
 	}
 }
 
-/* create the nodes the we depend on to properly start up */
-static void setup_initial_nodes(struct udev *udev)
-{
-	struct udev_device *dev;
-
-	dev = udev_device_new_from_subsystem_sysname(udev, "mem", "null");
-	if (dev != NULL) {
-		udev_node_mknod(dev, "null", makedev(0,0), 0666, 0, 0);
-		udev_device_unref(dev);
-	}
-	dev = udev_device_new_from_subsystem_sysname(udev, "mem", "kmsg");
-	if (dev != NULL) {
-		udev_node_mknod(dev, "kmsg", makedev(0,0), 0660, 0, 0);
-		udev_device_unref(dev);
-	}
-	dev = udev_device_new_from_subsystem_sysname(udev, "tty", "console");
-	if (dev != NULL) {
-		udev_node_mknod(dev, "console", makedev(0,0), 0600, 0, 0);
-		udev_device_unref(dev);
-	}
-}
-
 static void startup_log(struct udev *udev)
 {
 	FILE *f;
@@ -836,8 +801,6 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	setup_initial_nodes(udev);
-
 	/* make sure std{in,out,err} fd's are in a sane state */
 	fd = open("/dev/null", O_RDWR);
 	if (fd < 0) {