chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created cdrom_id program to make it easier to determine cdrom types
[elogind.git]
/
udevstart.c
diff --git
a/udevstart.c
b/udevstart.c
index 5f3ba711f0303deffaa1a5dc160ecdbd9d114597..90b87b8377465667de28de085dc003aa2f47eda1 100644
(file)
--- a/
udevstart.c
+++ b/
udevstart.c
@@
-33,6
+33,7
@@
#include <ctype.h>
#include <dirent.h>
#include <signal.h>
#include <ctype.h>
#include <dirent.h>
#include <signal.h>
+#include <syslog.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/types.h>
@@
-164,7
+165,7
@@
run:
if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, "add");
else
if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, "add");
else
-
execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL
);
+
run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_DEBUG)
);
}
}
exit:
}
}
exit:
@@
-315,10
+316,7
@@
static void udev_scan_class(void)
snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
dirname2[sizeof(dirname2)-1] = '\0';
snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
dirname2[sizeof(dirname2)-1] = '\0';
- /* pass the net class as it is */
- if (strcmp(dent->d_name, "net") == 0)
- device_list_insert(dirname2, "net", &device_list);
- else if (has_devt(dirname2))
+ if (has_devt(dirname2) || strcmp(dent->d_name, "net") == 0)
device_list_insert(dirname2, dent->d_name, &device_list);
}
closedir(dir2);
device_list_insert(dirname2, dent->d_name, &device_list);
}
closedir(dir2);
@@
-367,7
+365,7
@@
int main(int argc, char *argv[], char *envp[])
/* trigger timeout to prevent hanging processes */
alarm(UDEV_ALARM_TIMEOUT);
/* trigger timeout to prevent hanging processes */
alarm(UDEV_ALARM_TIMEOUT);
- udev_rules_init(&rules, 1);
+ udev_rules_init(&rules,
0,
1);
udev_scan_block();
udev_scan_class();
udev_scan_block();
udev_scan_class();