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] export udev_log flag to the environment
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 78090605206f1fab763c4a1dccb21d485967940b..39c16c2e77cc78133506955ec651e500838e7a77 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-34,16
+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"
-
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
+#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];
@@
-64,8
+57,7
@@
static void asmlinkage sig_handler(int signum)
{
switch (signum) {
case SIGALRM:
{
switch (signum) {
case SIGALRM:
- gotalarm = 1;
- break;
+ exit(1);
case SIGINT:
case SIGTERM:
exit(20 + signum);
case SIGINT:
case SIGTERM:
exit(20 + signum);
@@
-86,20
+78,19
@@
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();
udev_init_config();
- if (strstr(argv[0], "udevstart")) {
+ /* export logging flag, callouts may want to do the same as udev */
+ if (udev_log)
+ setenv("UDEV_LOG", "1", 1);
+
+ if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
act_type = UDEVSTART;
} else {
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?");
@@
-131,7
+122,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)) {
@@
-153,13
+144,14
@@
int main(int argc, char *argv[], char *envp[])
/* trigger timout to interrupt blocking syscalls */
alarm(ALARM_TIMEOUT);
/* trigger timout to interrupt blocking syscalls */
alarm(ALARM_TIMEOUT);
- /* initialize udev database */
- if (udevdb_init(UDEVDB_DEFAULT) != 0)
- info("error: unable to initialize database, continuing without database");
-
switch(act_type) {
case UDEVSTART:
dbg("udevstart");
switch(act_type) {
case UDEVSTART:
dbg("udevstart");
+
+ /* disable all logging as it's much too slow on some facilities */
+ udev_log = 0;
+ unsetenv("UDEV_LOG");
+
namedev_init();
retval = udev_start();
break;
namedev_init();
retval = udev_start();
break;
@@
-171,7
+163,7
@@
int main(int argc, char *argv[], char *envp[])
class_dev = sysfs_open_class_device_path(path);
if (class_dev == NULL) {
dbg ("sysfs_open_class_device_path failed");
class_dev = sysfs_open_class_device_path(path);
if (class_dev == NULL) {
dbg ("sysfs_open_class_device_path failed");
-
break
;
+
goto exit
;
}
dbg("opened class_dev->name='%s'", class_dev->name);
}
dbg("opened class_dev->name='%s'", class_dev->name);
@@
-181,8
+173,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;
@@
-193,11
+188,9
@@
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
);
}
}
- udevdb_exit();
-
exit:
logging_close();
return retval;
exit:
logging_close();
return retval;