chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove broken %e enumeration
[elogind.git]
/
udevstart.c
diff --git
a/udevstart.c
b/udevstart.c
index 11bdf791832759a9c8cd929b8bc448fe7b1a5fb1..0d9b4f4004513cc970ca6fb77f2e0a929207f727 100644
(file)
--- a/
udevstart.c
+++ b/
udevstart.c
@@
-108,6
+108,7
@@
static int add_device(const char *devpath)
{
struct sysfs_device *dev;
struct udevice *udev;
{
struct sysfs_device *dev;
struct udevice *udev;
+ int retval = 0;
/* clear and set environment for next event */
clearenv();
/* clear and set environment for next event */
clearenv();
@@
-129,7
+130,6
@@
static int add_device(const char *devpath)
/* override built-in sysfs device */
udev->dev = dev;
strcpy(udev->action, "add");
/* override built-in sysfs device */
udev->dev = dev;
strcpy(udev->action, "add");
- udev->devt = udev_device_get_devt(udev);
if (strcmp(udev->dev->subsystem, "net") != 0) {
udev->devt = udev_device_get_devt(udev);
if (strcmp(udev->dev->subsystem, "net") != 0) {
udev->devt = udev_device_get_devt(udev);
@@
-146,14
+146,12
@@
static int add_device(const char *devpath)
dbg("device event will be ignored");
goto exit;
}
dbg("device event will be ignored");
goto exit;
}
- if (udev->name[0]
== '\0') {
-
dbg("device node creation supressed"
);
- goto run;
- }
+ if (udev->name[0]
!= '\0')
+
retval = udev_device_event(&rules, udev
);
+ else
+ info("device node creation supressed");
- udev_add_device(udev);
-run:
- if (udev_run && !list_empty(&udev->run_list)) {
+ if (retval == 0 && udev_run) {
struct name_entry *name_loop;
dbg("executing run list");
struct name_entry *name_loop;
dbg("executing run list");
@@
-164,14
+162,14
@@
run:
char program[PATH_SIZE];
strlcpy(program, name_loop->name, sizeof(program));
char program[PATH_SIZE];
strlcpy(program, name_loop->name, sizeof(program));
- apply_format(udev, program, sizeof(program));
+
udev_rules_
apply_format(udev, program, sizeof(program));
run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
}
}
}
run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
}
}
}
+
exit:
udev_device_cleanup(udev);
exit:
udev_device_cleanup(udev);
-
return 0;
}
return 0;
}