shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

[PATCH] export DEVNAME to RUN-key executed programs

Browse Source
This commit is contained in:
kay.sievers@vrfy.org 2005-04-03 00:29:05 +02:00 committed by Greg KH
parent 87b60f72b7
commit 81af4e0519
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
udev.8.in
View File

@ -314,7 +314,7 @@ The name of a program must have the suffix
.I .dev
to be recognized.
.br
In addition to the hotplug environment variables,
In addition to the kernel provided hotplug environment variables,
.B UDEV_LOG
is set and contains the numerical priority value, if udev is configured to use
.BR syslog (3).

11
udev.c
View File

@ -204,6 +204,9 @@ int main(int argc, char *argv[], char *envp[])
retval = udev_remove_device(&udev);
}
if (udev.devname[0] != '\0')
setenv("DEVNAME", udev.devname, 1);
if (udev_run && !list_empty(&udev.run_list)) {
struct name_entry *name_loop;
@ -213,11 +216,9 @@ int main(int argc, char *argv[], char *envp[])
}
/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
if (udev.devname[0] != '\0') {
setenv("DEVNAME", udev.devname, 1);
if (udev_dev_d)
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
if (udev_dev_d && udev.devname[0] != '\0')
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
} else if (udev.type == DEV_DEVICE) {
if (strcmp(action, "add") == 0) {
/* wait for sysfs */

7
udevstart.c
View File

@ -126,6 +126,9 @@ static int add_device(const char *path, const char *subsystem)
udev_init_device(&udev, devpath, subsystem, "add");
udev_add_device(&udev, class_dev);
if (udev.devname[0] != '\0')
setenv("DEVNAME", udev.devname, 1);
if (udev_run && !list_empty(&udev.run_list)) {
struct name_entry *name_loop;
@ -135,10 +138,8 @@ static int add_device(const char *path, const char *subsystem)
}
/* run dev.d/ scripts if we created a node or changed a netif name */
if (udev_dev_d && udev.devname[0] != '\0') {
setenv("DEVNAME", udev.devname, 1);
if (udev_dev_d && udev.devname[0] != '\0')
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
sysfs_close_class_device(class_dev);
udev_cleanup_device(&udev);