shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 18:55:09 +03:00
Code

kmod: move #ifdef checks for kmod-setup out of main.c into kmod-setup.c

Browse Source
This commit is contained in:
Lennart Poettering 2014-11-14 17:58:32 +01:00
parent 264b807071
commit f84f9974d8
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -1121,6 +1121,8 @@ libsystemd_core_la_SOURCES = \
src/core/machine-id-setup.h \
src/core/mount-setup.c \
src/core/mount-setup.h \
src/core/kmod-setup.c \
src/core/kmod-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
src/core/namespace.c \
@ -1136,12 +1138,6 @@ libsystemd_core_la_SOURCES = \
src/core/failure-action.c \
src/core/failure-action.h
if HAVE_KMOD
libsystemd_core_la_SOURCES += \
src/core/kmod-setup.c \
src/core/kmod-setup.h
endif
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c

7
src/core/kmod-setup.c
View File

@ -23,13 +23,17 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
#ifdef HAVE_KMOD
#include <libkmod.h>
#endif
#include "macro.h"
#include "execute.h"
#include "capability.h"
#include "kmod-setup.h"
#ifdef HAVE_KMOD
static void systemd_kmod_log(
void *data,
int priority,
@ -52,8 +56,10 @@ static bool cmdline_check_kdbus(void) {
return strstr(line, "kdbus") != NULL;
}
#endif
int kmod_setup(void) {
#ifdef HAVE_KMOD
static const struct {
const char *module;
@ -123,5 +129,6 @@ int kmod_setup(void) {
if (ctx)
kmod_unref(ctx);
#endif
return 0;
}

6
src/core/main.c
View File

@ -75,9 +75,7 @@
#include "selinux-setup.h"
#include "ima-setup.h"
#include "smack-setup.h"
#ifdef HAVE_KMOD
#include "kmod-setup.h"
#endif
static enum {
ACTION_RUN,
@ -1389,10 +1387,10 @@ int main(int argc, char *argv[]) {
/* Mount /proc, /sys and friends, so that /proc/cmdline and
* /proc/$PID/fd is available. */
if (getpid() == 1) {
#ifdef HAVE_KMOD
/* Load the kernel modules early, so that we kdbus.ko is loaded before kdbusfs shall be mounted */
if (!skip_setup)
kmod_setup();
#endif
r = mount_setup(loaded_policy);
if (r < 0)