fix tests and remove no longer useful stuff

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index b9a4384ee06e649b5f41cfaf94be96270e12c617..4d1b9286a0884a4d13ddf1c850c831be51aaab6e 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
@@ -58,8 +56,7 @@ static int delete_path(const char *path)
                if (retval) {
                        if (errno == ENOTEMPTY)
                                return 0;
-                       dbg("rmdir(%s) failed with error '%s'",
-                           path, strerror(errno));
+                       err("rmdir(%s) failed: %s", path, strerror(errno));
                        break;
                }
                dbg("removed '%s'", path);
@@ -90,7 +87,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 +111,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);
@@ -154,9 +155,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);
 }