add DEVLINKS to the event environment

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index cff940ccfebfe7639a6e422a34b8c2129652a855..f9592b4c701a93cf432e5cc2f8147b25ab92ec22 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -32,42 +32,12 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "udev_db.h"
 #include "logging.h"
 
-static int delete_path(const char *path)
-{
-       char *pos;
-       int retval;
-
-       pos = strrchr(path, '/');
-       while (1) {
-               *pos = '\0';
-               pos = strrchr(path, '/');
-
-               /* don't remove the last one */
-               if ((pos == path) || (pos == NULL))
-                       break;
-
-               /* remove if empty */
-               retval = rmdir(path);
-               if (errno == ENOENT)
-                       retval = 0;
-               if (retval) {
-                       if (errno == ENOTEMPTY)
-                               return 0;
-                       dbg("rmdir(%s) failed with error '%s'",
-                           path, strerror(errno));
-                       break;
-               }
-               dbg("removed '%s'", path);
-       }
-       return 0;
-}
-
 static int delete_node(struct udevice *udev)
 {
        char filename[PATH_SIZE];
+       char devname[PATH_SIZE];
        char partitionname[PATH_SIZE];
        struct name_entry *name_loop;
        struct stat stats;
@@ -112,6 +82,10 @@ static int delete_node(struct udevice *udev)
        if (retval)
                return retval;
 
+       snprintf(devname, sizeof(devname), "%s/%s", udev_root, udev->name);
+       devname[sizeof(devname)-1] = '\0';
+       setenv("DEVNAME", devname, 1);
+
        num = udev->partitions;
        if (num > 0) {
                info("removing all_partitions '%s[1-%i]'", filename, num);
@@ -152,9 +126,6 @@ int udev_remove_device(struct udevice *udev)
                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);
 }