X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-remove.c;h=430f1c901e316592f6ab7dc1af0eee196c1d7dad;hp=cd917af193e6a05a128bebdba51720480ed25a0b;hb=a9ce0a410e7ef573f2f1f48ea793829d3cec389f;hpb=ea733a2f00174c3a39c8eb783e330b6a69abd67c

diff --git a/udev-remove.c b/udev-remove.c
index cd917af19..430f1c901 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -31,26 +31,30 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
 
 /*
- * Here would go a call to the naming deamon, to get the name we want to have
- * for this device.  But for now, let's just default to whatever the kernel is
- * calling the device as that will keep the "old-style" naming policy
+ * Look up the sysfs path in the database to see if we have named this device
+ * something different from the kernel name.  If we have, us it.  If not, use
+ * the default kernel name for lack of anything else to know to do.
  */
 static char *get_name(char *dev, int major, int minor)
 {
 	static char name[100];
 	char *temp;
 
+	if (udevdb_get_dev(dev, &name[0], sizeof(name)) == 0)
+		goto exit;
+
 	temp = strrchr(dev, '/');
 	if (temp == NULL)
 		return NULL;
 	strncpy(name, &temp[1], sizeof(name));
 
+exit:
 	dbg("name is %s", name);
-
 	return &name[0];
 }
 
@@ -80,9 +84,11 @@ int udev_remove_device(char *device, char *subsystem)
 		goto exit;
 	}
 
+	udevdb_delete_udevice(name);
+	udevdb_delete_dev(device);
+
 	return delete_node(name);
 
 exit:
 	return retval;
 }
-