X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-event.c;h=3c1a3e7aa77a184734a2a7d7901612aab1590afd;hp=8b7362cc10e830acf0ba1533faa69f7d5372a710;hb=a20a57a7bfbc6edd7602c135ca78f3e56878badb;hpb=d2f4a3464dacf56f50c3ab4fa42353efd33ce22b

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 8b7362cc1..3c1a3e7aa 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -38,15 +38,15 @@
 
 struct udev_event *udev_event_new(struct udev_device *dev)
 {
+	struct udev *udev = udev_device_get_udev(dev);
 	struct udev_event *event;
 
 	event = calloc(1, sizeof(struct udev_event));
 	if (event == NULL)
 		return NULL;
-	event->mode = 0600;
 	event->dev = dev;
-	event->udev = udev_device_get_udev(dev);
-	udev_list_init(&event->run_list);
+	event->udev = udev;
+	udev_list_init(udev, &event->run_list, false);
 	event->fd_signal = -1;
 	event->birth_usec = now_usec();
 	event->timeout_usec = 60 * 1000 * 1000;
@@ -58,7 +58,7 @@ void udev_event_unref(struct udev_event *event)
 {
 	if (event == NULL)
 		return;
-	udev_list_cleanup_entries(event->udev, &event->run_list);
+	udev_list_cleanup(&event->run_list);
 	free(event->tmp_node);
 	free(event->program_result);
 	free(event->name);
@@ -489,7 +489,7 @@ static int spawn_exec(struct udev_event *event,
 
 	/* exec failed */
 	err = -errno;
-	err(udev, "exec of program '%s' failed\n", cmd);
+	err(udev, "failed to execute '%s' '%s': %m\n", argv[0], cmd);
 	return err;
 }
 
@@ -958,10 +958,6 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
 			if (err == 0) {
 				info(event->udev, "renamed netif to '%s'\n", event->name);
 
-				/* delete stale db file */
-				udev_device_delete_db(dev);
-				udev_device_tag_index(dev, NULL, false);
-
 				/* remember old name */
 				udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
 
@@ -1021,9 +1017,22 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
 			if (event->dev_db != NULL)
 				udev_node_update_old_links(dev, event->dev_db);
 
-			/* change default 0600 to 0660 if a group is assigned */
-			if (event->mode == 0600 && event->gid > 0)
-				event->mode = 0660;
+			if (!event->mode_set) {
+				if (udev_device_get_devnode_mode(dev) > 0) {
+					/* kernel supplied value */
+					event->mode = udev_device_get_devnode_mode(dev);
+				} else if (event->gid > 0) {
+					/* default 0660 if a group is assigned */
+					event->mode = 0660;
+				} else {
+					/* default 0600 */
+					event->mode = 0600;
+				}
+			}
+
+			/* set sticky bit, so we do not remove the node on module unload */
+			if (event->static_node)
+				event->mode |= 01000;
 
 			err = udev_node_add(dev, event->mode, event->uid, event->gid);
 		}
@@ -1031,7 +1040,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
 		/* preserve old, or get new initialization timestamp */
 		if (event->dev_db != NULL && udev_device_get_usec_initialized(event->dev_db) > 0)
 			udev_device_set_usec_initialized(event->dev, udev_device_get_usec_initialized(event->dev_db));
-		else
+		else if (udev_device_get_usec_initialized(event->dev) == 0)
 			udev_device_set_usec_initialized(event->dev, now_usec());
 
 		/* (re)write database file */