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] support DRIVER as a rule key
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index b54896669b72baddf579a6af0897592a1431af50..a41f22277880be604ab4beef193847373110bbd0 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-34,14
+34,9
@@
#include "udev_lib.h"
#include "udev_sysfs.h"
#include "udev_version.h"
#include "udev_lib.h"
#include "udev_sysfs.h"
#include "udev_version.h"
-#include "logging.h"
#include "namedev.h"
#include "namedev.h"
-#include "udevdb.h"
-
+#include "logging.h"
-/* global variables */
-char **main_argv;
-char **main_envp;
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
@@
-83,20
+78,15
@@
int main(int argc, char *argv[], char *envp[])
} act_type;
dbg("version %s", UDEV_VERSION);
} act_type;
dbg("version %s", UDEV_VERSION);
-
- main_argv = argv;
- main_envp = envp;
-
logging_init("udev");
logging_init("udev");
-
udev_init_config();
if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
act_type = UDEVSTART;
} else {
udev_init_config();
if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
act_type = UDEVSTART;
} else {
- const char *action = get
_action(
);
- const char *devpath = get
_devpath(
);
- const char *subsystem =
get_subsystem(main_argv[1])
;
+ const char *action = get
env("ACTION"
);
+ const char *devpath = get
env("DEVPATH"
);
+ const char *subsystem =
argv[1]
;
if (!action) {
dbg("no action?");
if (!action) {
dbg("no action?");
@@
-128,7
+118,7
@@
int main(int argc, char *argv[], char *envp[])
goto exit;
}
goto exit;
}
- udev_set_values(&udev, devpath, subsystem);
+ udev_set_values(&udev, devpath, subsystem
, action
);
/* skip blacklisted subsystems */
if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
/* skip blacklisted subsystems */
if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
@@
-174,8
+164,11
@@
int main(int argc, char *argv[], char *envp[])
/* name, create node, store in db */
retval = udev_add_device(&udev, class_dev);
/* name, create node, store in db */
retval = udev_add_device(&udev, class_dev);
- /* run scripts */
- dev_d_execute(&udev);
+ /* run dev.d/ scripts if we created a node or changed a netif name */
+ if (udev.devname[0] != '\0') {
+ setenv("DEVNAME", udev.devname, 1);
+ dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+ }
sysfs_close_class_device(class_dev);
break;
sysfs_close_class_device(class_dev);
break;
@@
-186,7
+179,7
@@
int main(int argc, char *argv[], char *envp[])
retval = udev_remove_device(&udev);
/* run scripts */
retval = udev_remove_device(&udev);
/* run scripts */
- dev_d_execute(&udev);
+ dev_d_execute(&udev
, DEVD_DIR, DEVD_SUFFIX
);
}
exit:
}
exit: