From 31819a1e32fbd249264fbe089270d832b4987d39 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 5 Nov 2005 20:32:20 +0100 Subject: [PATCH 1/1] export DEVNAME on "remove" only if we really got a node to remove Signed-off-by: Kay Sievers --- udev_remove.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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); } -- 2.30.2