mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 18:55:40 +03:00
modprobe: kill support for nomodules
this should happen in the kernel itself, not be controlled from userspace, if at all. So let's kill this here.
This commit is contained in:
parent
f276a41821
commit
1cba2c90e8
@ -312,7 +312,6 @@ libsystemd_core_la_SOURCES = \
|
||||
src/hostname-setup.c \
|
||||
src/loopback-setup.c \
|
||||
src/kmod-setup.c \
|
||||
src/modprobe-setup.c \
|
||||
src/specifier.c \
|
||||
src/unit-name.c \
|
||||
src/fdset.c \
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include "hostname-setup.h"
|
||||
#include "loopback-setup.h"
|
||||
#include "kmod-setup.h"
|
||||
#include "modprobe-setup.h"
|
||||
#include "load-fragment.h"
|
||||
#include "fdset.h"
|
||||
#include "special.h"
|
||||
@ -63,7 +62,6 @@ static bool arg_dump_core = true;
|
||||
static bool arg_crash_shell = false;
|
||||
static int arg_crash_chvt = -1;
|
||||
static bool arg_confirm_spawn = false;
|
||||
static bool arg_nomodules = false;
|
||||
static bool arg_show_status = true;
|
||||
static bool arg_sysv_console = true;
|
||||
|
||||
@ -335,10 +333,7 @@ static int parse_proc_cmdline_word(const char *word) {
|
||||
"systemd.log_color=0|1 Highlight important log messages\n"
|
||||
"systemd.log_location=0|1 Include code location in log messages\n");
|
||||
|
||||
} else if (streq(word, "nomodules"))
|
||||
arg_nomodules = true;
|
||||
|
||||
else if (streq(word, "quiet")) {
|
||||
} if (streq(word, "quiet")) {
|
||||
arg_show_status = false;
|
||||
arg_sysv_console = false;
|
||||
} else {
|
||||
@ -979,7 +974,6 @@ int main(int argc, char *argv[]) {
|
||||
if (arg_show_status)
|
||||
status_welcome();
|
||||
|
||||
modprobe_setup(arg_nomodules);
|
||||
kmod_setup();
|
||||
hostname_setup();
|
||||
loopback_setup();
|
||||
|
@ -1,36 +0,0 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2010 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "modprobe-setup.h"
|
||||
|
||||
#include "util.h"
|
||||
|
||||
int modprobe_setup(bool nomodules) {
|
||||
int r;
|
||||
|
||||
if (!nomodules)
|
||||
return 0;
|
||||
|
||||
if ((r = write_one_line_file("/proc/sys/kernel/modprobe", "/bin/true")) < 0)
|
||||
log_error("Failed to write /proc/sys/kernel/modprobe: %m");
|
||||
|
||||
return r;
|
||||
}
|
@ -1,29 +0,0 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#ifndef foomodprobesetuphfoo
|
||||
#define foomodprobesetuphfoo
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2010 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
int modprobe_setup(bool arg_nomodules);
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user