chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8544c9a
)
[PATCH] check earlier if we should run as udevstart
author
kay.sievers@vrfy.org
<kay.sievers@vrfy.org>
Sun, 12 Dec 2004 02:29:59 +0000
(
03:29
+0100)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 06:13:48 +0000
(23:13 -0700)
udev.c
patch
|
blob
|
history
diff --git
a/udev.c
b/udev.c
index 4d25ed267a6442328f8af44b6d311246dfe0ab8b..0ee70529c4edb923b053c104570a9a1a1623532c 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-128,14
+128,6
@@
int main(int argc, char *argv[], char *envp[])
/* trigger timeout to prevent hanging processes */
alarm(ALARM_TIMEOUT);
/* trigger timeout to prevent hanging processes */
alarm(ALARM_TIMEOUT);
- action = getenv("ACTION");
- devpath = getenv("DEVPATH");
- subsystem = getenv("SUBSYSTEM");
- /* older kernels passed the SUBSYSTEM only as argument */
- if (!subsystem && argc == 2)
- subsystem = argv[1];
- udev_init_device(&udev, devpath, subsystem);
-
if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
dbg("udevstart");
if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
dbg("udevstart");
@@
-147,6
+139,14
@@
int main(int argc, char *argv[], char *envp[])
goto exit;
}
goto exit;
}
+ action = getenv("ACTION");
+ devpath = getenv("DEVPATH");
+ subsystem = getenv("SUBSYSTEM");
+ /* 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;