X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=83518604724f001657037ec72bad77c222dbae2e;hp=28885d4710faa15df1dd70f66c440408990b95a6;hb=4389ec08fb177f62fc02eb2217fed126aef3a7a3;hpb=e8d569b4145a358775e87058829133fa725b32fd

diff --git a/udev_remove.c b/udev_remove.c
index 28885d471..835186047 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -32,7 +32,6 @@
 #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)
@@ -56,8 +55,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);
@@ -88,7 +86,7 @@ static int delete_node(struct udevice *udev)
 			continue;;
 		}
 
-		dbg("removing symlink '%s'", filename);
+		info("removing symlink '%s'", filename);
 		unlink(filename);
 
 		if (strchr(filename, '/'))
@@ -112,6 +110,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);
@@ -152,9 +154,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);
 }