From: sjoerd@spring.luon.net <sjoerd@spring.luon.net>
Date: Tue, 23 Nov 2004 15:49:55 +0000 (-0800)
Subject: [PATCH] DEVNAME on device removal
X-Git-Tag: 047~37
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67aca2c50984d0b463c714eba142f33bb07f45a2;p=systemd

[PATCH] DEVNAME on device removal

  I just noticed that the DEVNAME enviroment variable isn't being set anymore
  in udev 0.046 on device removal, while it was being set in 0.042. We're using
  the property tto do umount -l <devices> when a block device is removed. Afaik
  there is no other way to associate a device with it's DEVNAME on removal ?

  Also are there cases where doing umount -l on the removed devices is wrong?
  I guess the device is gone, so there is no sense in keeping it mounted (it's
  not like the filesystem is gonna come back in a sane state again)..

  Attached (trivial) patch brings back the DEVNAME variable on device removal.
---

diff --git a/udev.c b/udev.c
index dad64288..efeb1b50 100644
--- a/udev.c
+++ b/udev.c
@@ -192,6 +192,10 @@ int main(int argc, char *argv[], char *envp[])
 			/* get node from db, remove db-entry, delete created node */
 			retval = udev_remove_device(&udev);
 
+			/* Set the DEVNAME if known */
+			if (udev.devname[0] != '\0') {
+				setenv("DEVNAME", udev.devname, 1);
+			}
 			/* run dev.d/ scripts if we're not instructed to ignore the event */
 			if (udev.devname[0] != '\0') {
 				setenv("DEVNAME", udev.devname, 1);