X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=8183793e5f4536824b3fd62fc0b0f207daf0a275;hb=71b4b701b1c5261de0dba5b071ec10089361de0e;hp=5716afef7a38308ca74817f894b781c6ea5ed0b5;hpb=fc206fbe3e326f5acfc64243f9e04eecad121e27;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 5716afef7..8183793e5 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -23,9 +23,10 @@
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>
+#include <time.h>
+#include <net/if.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <net/if.h>
 #include <linux/sockios.h>
 
 #include "udev.h"
@@ -505,6 +506,8 @@ static int rename_netif(struct udev_event *event)
 		util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
 		loop = 90 * 20;
 		while (loop--) {
+			const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
+
 			err = ioctl(sk, SIOCSIFNAME, &ifr);
 			if (err == 0) {
 				rename_netif_kernel_log(ifr);
@@ -518,7 +521,7 @@ static int rename_netif(struct udev_event *event)
 			}
 			dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
 			    event->name, (90 * 20) - loop);
-			usleep(1000 * 1000 / 20);
+			nanosleep(&duration, NULL);
 		}
 	}
 exit:
@@ -531,10 +534,12 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 	struct udev_device *dev = event->dev;
 	int err = 0;
 
-	if (udev_device_get_devpath_old(dev) != NULL) {
-		if (udev_device_rename_db(dev, udev_device_get_devpath(dev)) == 0)
-			info(event->udev, "moved database from '%s' to '%s'\n",
-			     udev_device_get_devpath_old(dev), udev_device_get_devpath(dev));
+	if (udev_device_get_sysname_old(dev) != NULL &&
+	    strcmp(udev_device_get_sysname_old(dev), udev_device_get_sysname(dev)) != 0) {
+		udev_device_rename_db(dev);
+		info(event->udev, "moved database from '%s:%s' to '%s:%s'\n",
+		     udev_device_get_subsystem(dev), udev_device_get_sysname_old(dev),
+		     udev_device_get_subsystem(dev), udev_device_get_sysname(dev));
 	}
 
 	/* add device node */
@@ -571,7 +576,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 		}
 
 		if (event->name != NULL && event->name[0] == '\0') {
-			info(event->udev, "device node creation supressed\n");
+			info(event->udev, "device node creation suppressed\n");
 			delete_kdevnode = 1;
 			goto exit_add;
 		}
@@ -741,7 +746,7 @@ int udev_event_execute_run(struct udev_event *event)
 			udev_event_apply_format(event, cmd, program, sizeof(program));
 			envp = udev_device_get_properties_envp(event->dev);
 			if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
-				if (!udev_list_entry_get_flag(list_entry))
+				if (udev_list_entry_get_flag(list_entry))
 					err = -1;
 			}
 		}