X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=cff940ccfebfe7639a6e422a34b8c2129652a855;hp=a81d20c98c7a3f1aaf7878177262479d96438f7a;hb=57d782bf1e8313e65579a8faa9671a8e5ffecb2f;hpb=e6764498e7592f216a1895eacc485448fa4a1660

diff --git a/udev_remove.c b/udev_remove.c
index a81d20c98..cff940ccf 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -1,10 +1,8 @@
 /*
  * udev-remove.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	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
@@ -34,7 +32,6 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
 #include "udev_db.h"
 #include "logging.h"
 
@@ -91,7 +88,7 @@ static int delete_node(struct udevice *udev)
 			continue;;
 		}
 
-		dbg("removing symlink '%s'", filename);
+		info("removing symlink '%s'", filename);
 		unlink(filename);
 
 		if (strchr(filename, '/'))
@@ -141,8 +138,6 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-	const char *temp;
-
 	if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
 		return 0;
 
@@ -154,14 +149,9 @@ int udev_remove_device(struct udevice *udev)
 		dbg("remove name='%s'", udev->name);
 		udev_db_delete_device(udev);
 	} else {
-		/* fall back to kernel name */
-		temp = strrchr(udev->devpath, '/');
-		if (temp == NULL)
-			return -ENODEV;
-		strlcpy(udev->name, &temp[1], sizeof(udev->name));
-		dbg("'%s' not found in database, falling back on default name", udev->name);
+		dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
+		strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
 	}
-
 	/* use full path to the environment */
 	snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
 	udev->devname[sizeof(udev->devname)-1] = '\0';