export DEVNAME on "remove" only if we really got a node to remove

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index 0a9996dc6a849b9a3b8cc78d38f733ddb5a6ad0a..0d536bc8ffc03550f2c5ec65e626a9d7e0bb68a6 100644 (file)
--- 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
@@ -90,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, '/'))
@@ -114,6 +112,10 @@ static int delete_node(struct udevice *udev)
        if (retval)
                return retval;
 
+       /* export DEVNAME to the environment */
+       snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
+       udev->devname[sizeof(udev->devname)-1] = '\0';
+
        num = udev->partitions;
        if (num > 0) {
                info("removing all_partitions '%s[1-%i]'", filename, num);
@@ -140,8 +142,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;
 
@@ -153,17 +153,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';
-
        return delete_node(udev);
 }