diff options
| -rw-r--r-- | src/udev/udev-builtin-kmod.c | 23 | ||||
| -rw-r--r-- | src/udev/udev-builtin.c | 14 | ||||
| -rw-r--r-- | src/udev/udevd.c | 5 |
3 files changed, 23 insertions, 19 deletions
diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c index 87a81bfaab..baf8c8c6ee 100644 --- a/src/udev/udev-builtin-kmod.c +++ b/src/udev/udev-builtin-kmod.c @@ -1,7 +1,7 @@ /* * load kernel modules * - * Copyright (C) 2011 Kay Sievers <kay.sievers@vrfy.org> + * Copyright (C) 2011-21012 Kay Sievers <kay.sievers@vrfy.org> * Copyright (C) 2011 ProFUSION embedded systems * * This program is free software: you can redistribute it and/or modify @@ -39,6 +39,8 @@ static int load_module(struct udev *udev, const char *alias) struct kmod_list *l; int err; + assert(ctx); + err = kmod_module_new_from_lookup(ctx, alias, &list); if (err < 0) return err; @@ -70,22 +72,11 @@ static void udev_kmod_log(void *data, int priority, const char *file, int line, udev_main_log(data, priority, file, line, fn, format, args); } -/* needs to re-instantiate the context after a reload */ static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test) { struct udev *udev = udev_device_get_udev(dev); int i; - if (!ctx) { - ctx = kmod_new(NULL, NULL); - if (!ctx) - return -ENOMEM; - - log_debug("load module index\n"); - kmod_set_log_fn(ctx, udev_kmod_log, udev); - kmod_load_resources(ctx); - } - if (argc < 3 || strcmp(argv[1], "load")) { log_error("expect: %s load <module>\n", argv[0]); return EXIT_FAILURE; @@ -99,7 +90,7 @@ static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool te return EXIT_SUCCESS; } -/* called at udev startup */ +/* called at udev startup and reload */ static int builtin_kmod_init(struct udev *udev) { if (ctx) @@ -126,9 +117,9 @@ static void builtin_kmod_exit(struct udev *udev) static bool builtin_kmod_validate(struct udev *udev) { log_debug("validate module index\n"); - if (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK) - return true; - return false; + if (!ctx) + return false; + return (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK); } const struct udev_builtin udev_builtin_kmod = { diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index 6509f5881d..7d89f22792 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 Kay Sievers <kay.sievers@vrfy.org> + * Copyright (C) 2007-2012 Kay Sievers <kay.sievers@vrfy.org> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,8 @@ #include "udev.h" +static bool initialized; + static const struct udev_builtin *builtins[] = { [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, @@ -44,6 +46,9 @@ int udev_builtin_init(struct udev *udev) unsigned int i; int err = 0; + if (initialized) + return 0; + for (i = 0; i < ELEMENTSOF(builtins); i++) { if (builtins[i]->init) { err = builtins[i]->init(udev); @@ -51,6 +56,8 @@ int udev_builtin_init(struct udev *udev) break; } } + + initialized = true; return err; } @@ -58,9 +65,14 @@ void udev_builtin_exit(struct udev *udev) { unsigned int i; + if (!initialized) + return; + for (i = 0; i < ELEMENTSOF(builtins); i++) if (builtins[i]->exit) builtins[i]->exit(udev); + + initialized = false; } bool udev_builtin_validate(struct udev *udev) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index b78c18f20a..23351aebd5 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1107,7 +1107,7 @@ int main(int argc, char *argv[]) case 'D': debug = true; log_set_max_level(LOG_DEBUG); - udev_set_log_priority(udev, LOG_INFO); + udev_set_log_priority(udev, LOG_DEBUG); break; case 'N': if (strcmp (optarg, "early") == 0) { @@ -1486,7 +1486,7 @@ int main(int argc, char *argv[]) worker_kill(udev); rules = udev_rules_unref(rules); udev_builtin_exit(udev); - reload = 0; + reload = false; } /* event has finished */ @@ -1506,6 +1506,7 @@ int main(int argc, char *argv[]) /* start new events */ if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) { + udev_builtin_init(udev); if (rules == NULL) rules = udev_rules_new(udev, resolve_names); if (rules != NULL) |