chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] namedev: skip backslashes only if followed by newline
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 5dbade3c6f6dffb7cfb91f385944552090c459d3..7854bc74d0a2f4a8e7f98c3881bf4946c13de409 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-152,18
+152,15
@@
int main(int argc, char *argv[], char *envp[])
/* older kernels passed the SUBSYSTEM only as argument */
if (!subsystem && argc == 2)
subsystem = argv[1];
/* older kernels passed the SUBSYSTEM only as argument */
if (!subsystem && argc == 2)
subsystem = argv[1];
- udev_init_device(&udev, devpath, subsystem);
if (!action) {
dbg("no action");
goto hotplug;
}
if (!action) {
dbg("no action");
goto hotplug;
}
-
if (!subsystem) {
dbg("no subsystem");
goto hotplug;
}
if (!subsystem) {
dbg("no subsystem");
goto hotplug;
}
-
if (!devpath) {
dbg("no devpath");
goto hotplug;
if (!devpath) {
dbg("no devpath");
goto hotplug;
@@
-173,7
+170,9
@@
int main(int argc, char *argv[], char *envp[])
if (udev_log)
setenv("UDEV_LOG", "1", 1);
if (udev_log)
setenv("UDEV_LOG", "1", 1);
- if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+ udev_init_device(&udev, devpath, subsystem);
+
+ if (udev.type == BLOCK || udev.type == CLASS || udev.type == NET) {
if (strcmp(action, "add") == 0) {
/* wait for sysfs and possibly add node */
dbg("udev add");
if (strcmp(action, "add") == 0) {
/* wait for sysfs and possibly add node */
dbg("udev add");
@@
-221,7
+220,7
@@
int main(int argc, char *argv[], char *envp[])
if (udev_dev_d)
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
if (udev_dev_d)
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
- } else if (
(strncmp(devpath, "/devices/", 9) == 0)
) {
+ } else if (
udev.type == PHYSDEV
) {
if (strcmp(action, "add") == 0) {
/* wait for sysfs */
dbg("devices add");
if (strcmp(action, "add") == 0) {
/* wait for sysfs */
dbg("devices add");