X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=0d536bc8ffc03550f2c5ec65e626a9d7e0bb68a6;hp=cff940ccfebfe7639a6e422a34b8c2129652a855;hb=31819a1e32fbd249264fbe089270d832b4987d39;hpb=287814b23cd564043391ce449f27e6ccd9d244e4

diff --git a/udev_remove.c b/udev_remove.c
index cff940ccf..0d536bc8f 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -112,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);
@@ -152,9 +156,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);
 }