X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_device.c;h=bbf7963afce78897f38d88eca4a2b23efade9853;hp=03514e1d48bbc0c2ed2ff05816d9628a622ac1ec;hb=285e2a24f67b1c09d7b4c54587802fc0a9d623eb;hpb=eb5b86405b14ca2ac2508f9dec9862cc57110131

diff --git a/udev_device.c b/udev_device.c
index 03514e1d4..bbf7963af 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -164,6 +164,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* read current database entry; cleanup, if it is known device */
 		udev_old = udev_device_init(NULL);
 		if (udev_old != NULL) {
+			udev_old->test_run = udev->test_run;
 			if (udev_db_get_device(udev_old, udev->dev->devpath) == 0) {
 				info("device '%s' already in database, cleanup", udev->dev->devpath);
 				udev_db_delete_device(udev_old);
@@ -238,8 +239,8 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
 			udev_db_delete_device(udev);
 			if (udev->ignore_remove) {
-				dbg("remove event for '%s' requested to be ignored by rule", udev->name);
-				return 0;
+				info("ignore_remove for '%s'", udev->name);
+				goto exit;
 			}
 			/* restore stored persistent data */
 			list_for_each_entry(name_loop, &udev->env_list, node)