chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
modules-load
/
modules-load.c
diff --git
a/src/modules-load/modules-load.c
b/src/modules-load/modules-load.c
index 08de5e0ce9e506121b87ad86a72d541ca80c017e..76e940336103eec835d6289e1f8316ff849c59d8 100644
(file)
--- a/
src/modules-load/modules-load.c
+++ b/
src/modules-load/modules-load.c
@@
-19,13
+19,10
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <unistd.h>
-#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
#include <limits.h>
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
#include <limits.h>
-#include <dirent.h>
#include <getopt.h>
#include <libkmod.h>
#include <getopt.h>
#include <libkmod.h>
@@
-33,26
+30,17
@@
#include "util.h"
#include "strv.h"
#include "conf-files.h"
#include "util.h"
#include "strv.h"
#include "conf-files.h"
-#include "fileio.h"
#include "build.h"
static char **arg_proc_cmdline_modules = NULL;
#include "build.h"
static char **arg_proc_cmdline_modules = NULL;
-static const char conf_file_dirs[] =
- "/etc/modules-load.d\0"
- "/run/modules-load.d\0"
- "/usr/local/lib/modules-load.d\0"
- "/usr/lib/modules-load.d\0"
-#ifdef HAVE_SPLIT_USR
- "/lib/modules-load.d\0"
-#endif
- ;
+static const char conf_file_dirs[] = CONF_DIRS_NULSTR("modules-load");
static void systemd_kmod_log(void *data, int priority, const char *file, int line,
const char *fn, const char *format, va_list args) {
DISABLE_WARNING_FORMAT_NONLITERAL;
static void systemd_kmod_log(void *data, int priority, const char *file, int line,
const char *fn, const char *format, va_list args) {
DISABLE_WARNING_FORMAT_NONLITERAL;
- log_
metav(priority
, file, line, fn, format, args);
+ log_
internalv(priority, 0
, file, line, fn, format, args);
REENABLE_WARNING;
}
REENABLE_WARNING;
}
@@
-89,10
+77,8
@@
static int load_module(struct kmod_ctx *ctx, const char *m) {
log_debug("load: %s", m);
r = kmod_module_new_from_lookup(ctx, m, &modlist);
log_debug("load: %s", m);
r = kmod_module_new_from_lookup(ctx, m, &modlist);
- if (r < 0) {
- log_error("Failed to lookup alias '%s': %s", m, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to lookup alias '%s': %m", m);
if (!modlist) {
log_error("Failed to find module '%s'", m);
if (!modlist) {
log_error("Failed to find module '%s'", m);
@@
-124,8
+110,7
@@
static int load_module(struct kmod_ctx *ctx, const char *m) {
else if (err == KMOD_PROBE_APPLY_BLACKLIST)
log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
else {
else if (err == KMOD_PROBE_APPLY_BLACKLIST)
log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
else {
- log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
- strerror(-err));
+ log_error_errno(err, "Failed to insert '%s': %m", kmod_module_get_name(mod));
r = err;
}
}
r = err;
}
}
@@
-150,8
+135,7
@@
static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
if (ignore_enoent && r == -ENOENT)
return 0;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error("Failed to open %s, ignoring: %s", path, strerror(-r));
- return r;
+ return log_error_errno(r, "Failed to open %s, ignoring: %m", path);
}
log_debug("apply: %s", path);
}
log_debug("apply: %s", path);
@@
-163,7
+147,7
@@
static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
if (feof(f))
break;
if (feof(f))
break;
- log_error
(
"Failed to read file '%s', ignoring: %m", path);
+ log_error
_errno(errno,
"Failed to read file '%s', ignoring: %m", path);
return -errno;
}
return -errno;
}
@@
-245,7
+229,7
@@
int main(int argc, char *argv[]) {
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning
("Failed to parse kernel command line, ignoring: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to parse kernel command line, ignoring: %m"
);
ctx = kmod_new(NULL, NULL);
if (!ctx) {
ctx = kmod_new(NULL, NULL);
if (!ctx) {
@@
-279,7
+263,7
@@
int main(int argc, char *argv[]) {
k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (k < 0) {
k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (k < 0) {
- log_error
("Failed to enumerate modules-load.d files: %s", strerror(-k)
);
+ log_error
_errno(k, "Failed to enumerate modules-load.d files: %m"
);
if (r == 0)
r = k;
goto finish;
if (r == 0)
r = k;
goto finish;