[systemd-commits] 2 commits - fixme Makefile.am src/automount.c src/kmod-setup.c src/kmod-setup.h src/main.c units/basic.target.m4 units/fedora units/shutdown.target
Lennart Poettering
lennart at kemper.freedesktop.org
Fri May 21 15:30:03 PDT 2010
Makefile.am | 1
fixme | 2
src/automount.c | 14 -----
src/kmod-setup.c | 107 +++++++++++++++++++++++++++++++++++++++++++
src/kmod-setup.h | 27 ++++++++++
src/main.c | 2
units/basic.target.m4 | 1
units/fedora/killall.service | 1
units/shutdown.target | 1
9 files changed, 144 insertions(+), 12 deletions(-)
New commits:
commit 11c3a4eeb7e65eccd6fc0870bb1cda315fa33ba5
Author: Lennart Poettering <lennart at poettering.net>
Date: Sat May 22 00:29:53 2010 +0200
kmod: automatically load a few kernel modules we need for normal operation before udev is active
diff --git a/Makefile.am b/Makefile.am
index 8313e57..194e373 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,6 +188,7 @@ COMMON_SOURCES = \
src/mount-setup.c \
src/hostname-setup.c \
src/loopback-setup.c \
+ src/kmod-setup.c \
src/utmp-wtmp.c \
src/specifier.c \
src/unit-name.c \
diff --git a/fixme b/fixme
index 4c45633..d15e0db 100644
--- a/fixme
+++ b/fixme
@@ -63,7 +63,7 @@
* Add code to systemctl to wait for an operation to finish
-* kmod-setup.c
+* update to new libudev/tags
Regularly:
diff --git a/src/automount.c b/src/automount.c
index 730b157..3268046 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -276,18 +276,8 @@ static int open_dev_autofs(Manager *m) {
return m->dev_autofs_fd;
if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
-
- if (errno == ENOENT || errno == ENODEV) {
- log_error("Your kernel apparently lacks built-in autofs4 support. Please fix that. "
- "We'll now try to work around this by calling 'modprobe autofs4'...");
- system("/sbin/modprobe -q -- autofs4");
- m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY);
- }
-
- if (m->dev_autofs_fd < 0) {
- log_error("Failed to open /dev/autofs: %s", strerror(errno));
- return -errno;
- }
+ log_error("Failed to open /dev/autofs: %s", strerror(errno));
+ return -errno;
}
init_autofs_dev_ioctl(¶m);
diff --git a/src/kmod-setup.c b/src/kmod-setup.c
new file mode 100644
index 0000000..fa856c9
--- /dev/null
+++ b/src/kmod-setup.c
@@ -0,0 +1,107 @@
+/*-*- Mode: C; c-basic-offset: 8 -*-*/
+
+/***
+ 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 <sys/wait.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include "macro.h"
+#include "execute.h"
+
+#include "kmod-setup.h"
+
+static const char * const kmod_table[] = {
+ "autofs4", "/sys/class/misc/autofs",
+ "ipv6", "/sys/module/ipv6"
+};
+
+int kmod_setup(void) {
+ unsigned i, n = 0;
+ const char * cmdline[3 + ELEMENTSOF(kmod_table) + 1];
+ ExecCommand command;
+ ExecContext context;
+ pid_t pid;
+ int status, r;
+
+ for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) {
+
+ if (access(kmod_table[i+1], F_OK) >= 0)
+ continue;
+
+ log_info("Your kernel apparently lacks built-in %s support. Please fix that. "
+ "We'll now try to work around this by calling '/sbin/modprobe %s'...",
+ kmod_table[i], kmod_table[i]);
+
+ cmdline[3 + n++] = kmod_table[i];
+ }
+
+ if (n <= 0)
+ return 0;
+
+ cmdline[0] = "/sbin/modprobe";
+ cmdline[1] = "-qab";
+ cmdline[2] = "--";
+ cmdline[3 + n] = NULL;
+
+ zero(command);
+ zero(context);
+
+ command.path = (char*) cmdline[0];
+ command.argv = (char**) cmdline;
+
+ exec_context_init(&context);
+ r = exec_spawn(&command, NULL, &context, NULL, 0, NULL, false, false, false, NULL, &pid);
+ exec_context_done(&context);
+
+ if (r < 0)
+ return r;
+
+ for (;;) {
+ if (waitpid(pid, &status, 0) < 0) {
+
+ if (errno == EINTR)
+ continue;
+
+ return -errno;
+ }
+
+ break;
+ }
+
+ if (WIFEXITED(status)) {
+ if (WEXITSTATUS(status) != 0) {
+ log_warning("/sbin/modprobe failed with error code %i.", WEXITSTATUS(status));
+ return -EPROTO;
+ }
+
+ log_debug("/sbin/modprobe succeeded.");
+ return 0;
+ }
+
+ if (WIFSIGNALED(status)) {
+ log_warning("/sbin/modprobe terminated by signal %s.", strsignal(WTERMSIG(status)));
+ return -EPROTO;
+ }
+
+ log_warning("/sbin/modprobe failed due to unknown reason.");
+ return -EPROTO;
+}
diff --git a/src/kmod-setup.h b/src/kmod-setup.h
new file mode 100644
index 0000000..c102b52
--- /dev/null
+++ b/src/kmod-setup.h
@@ -0,0 +1,27 @@
+/*-*- Mode: C; c-basic-offset: 8 -*-*/
+
+#ifndef fookmodsetuphfoo
+#define fookmodsetuphfoo
+
+/***
+ 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/>.
+***/
+
+int kmod_setup(void);
+
+#endif
diff --git a/src/main.c b/src/main.c
index 2e754fe..95d2115 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,6 +37,7 @@
#include "mount-setup.h"
#include "hostname-setup.h"
#include "loopback-setup.h"
+#include "kmod-setup.h"
#include "load-fragment.h"
#include "fdset.h"
@@ -639,6 +640,7 @@ int main(int argc, char *argv[]) {
log_debug("systemd running in %s mode.", manager_running_as_to_string(running_as));
if (running_as == MANAGER_INIT) {
+ kmod_setup();
hostname_setup();
loopback_setup();
}
commit e962f5c34f8e292090fa8c7cb265106a621c8735
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri May 21 23:53:09 2010 +0200
units: mark a couple of services as OnlyByDependency
diff --git a/fixme b/fixme
index 08ba2dd..4c45633 100644
--- a/fixme
+++ b/fixme
@@ -63,6 +63,8 @@
* Add code to systemctl to wait for an operation to finish
+* kmod-setup.c
+
Regularly:
* look for close() vs. close_nointr() vs. close_nointr_nofail()
diff --git a/units/basic.target.m4 b/units/basic.target.m4
index a864332..537ad8d 100644
--- a/units/basic.target.m4
+++ b/units/basic.target.m4
@@ -12,6 +12,7 @@ Description=Basic System
Requires=local-fs.target swap.target sockets.target
After=local-fs.target swap.target sockets.target
Conflicts=emergency.service
+OnlyByDependency=yes
m4_dnl
m4_ifdef(`TARGET_FEDORA',
m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit
diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index a7e07c7..84c56cb 100644
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -8,6 +8,7 @@
[Unit]
Description=Kill All Processes
After=shutdown.target
+OnlyByDependency=yes
[Service]
Type=finish
diff --git a/units/shutdown.target b/units/shutdown.target
index 098cd28..c05b8b9 100644
--- a/units/shutdown.target
+++ b/units/shutdown.target
@@ -9,3 +9,4 @@
[Unit]
Description=Shutdown
+OnlyByDependency=yes
More information about the systemd-commits
mailing list