X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=832abbbfce097007e8e2116054b562d5b5b58e58;hb=cbdb9c39f611c8ce410cf8da5db21eb3dfb10b34;hp=e583cec2924e9b2f740802f0abad89a7640a6a99;hpb=ead7c62ab7641e150c6d668f939c102a6771ce60;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index e583cec29..832abbbfc 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -43,13 +43,12 @@ struct udev_event *udev_event_new(struct udev_device *dev)
 	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->fd_signal = -1;
 	event->birth_usec = now_usec();
-	event->timeout_usec = 120 * 1000 * 1000;
+	event->timeout_usec = 60 * 1000 * 1000;
 	dbg(event->udev, "allocated event %p\n", event);
 	return event;
 }
@@ -489,7 +488,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;
 }
 
@@ -660,7 +659,7 @@ static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
 			goto out;
 		}
 		if (fdcount == 0) {
-			err(udev, "timeout: killing '%s'[%u]\n", cmd, pid);
+			err(udev, "timeout: killing '%s' [%u]\n", cmd, pid);
 			kill(pid, SIGKILL);
 		}
 
@@ -681,11 +680,20 @@ static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
 				if (waitpid(pid, &status, WNOHANG) < 0)
 					break;
 				if (WIFEXITED(status)) {
-					info(udev, "'%s'[%u] returned with exitcode %i\n", cmd, pid, WEXITSTATUS(status));
+					info(udev, "'%s' [%u] exit with return code %i\n", cmd, pid, WEXITSTATUS(status));
 					if (WEXITSTATUS(status) != 0)
 						err = -1;
+				} else if (WIFSIGNALED(status)) {
+					err(udev, "'%s' [%u] terminated by signal %i (%s)\n", cmd, pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+					err = -1;
+				} else if (WIFSTOPPED(status)) {
+					err(udev, "'%s' [%u] stopped\n", cmd, pid);
+					err = -1;
+				} else if (WIFCONTINUED(status)) {
+					err(udev, "'%s' [%u] continued\n", cmd, pid);
+					err = -1;
 				} else {
-					err(udev, "'%s'[%u] unexpected exit with status 0x%04x\n", cmd, pid, status);
+					err(udev, "'%s' [%u] exit with status 0x%04x\n", cmd, pid, status);
 					err = -1;
 				}
 				pid = 0;
@@ -830,7 +838,7 @@ static void rename_netif_kernel_log(struct ifreq ifr)
 		return;
 	}
 
-	fprintf(f, "<30>udev[%u]: renamed network interface %s to %s\n",
+	fprintf(f, "<30>udevd[%u]: renamed network interface %s to %s\n",
 		getpid(), ifr.ifr_name, ifr.ifr_newname);
 	fclose(f);
 }
@@ -868,7 +876,7 @@ static int rename_netif(struct udev_event *event)
 		goto out;
 
 	/* free our own name, another process may wait for us */
-	util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL);
+	snprintf(ifr.ifr_newname, IFNAMSIZ, "rename%u", udev_device_get_ifindex(dev));
 	err = ioctl(sk, SIOCSIFNAME, &ifr);
 	if (err < 0) {
 		err = -errno;
@@ -1012,9 +1020,18 @@ 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;
+				}
+			}
 
 			err = udev_node_add(dev, event->mode, event->uid, event->gid);
 		}
@@ -1066,7 +1083,7 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
 			udev_event_apply_format(event, cmd, program, sizeof(program));
 			envp = udev_device_get_properties_envp(event->dev);
 			if (udev_event_spawn(event, program, envp, sigmask, NULL, 0) < 0) {
-				if (udev_list_entry_get_flags(list_entry))
+				if (udev_list_entry_get_num(list_entry))
 					err = -1;
 			}
 		}