diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-05-22 00:29:53 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-05-22 00:29:53 +0200 |
commit | 11c3a4eeb7e65eccd6fc0870bb1cda315fa33ba5 (patch) | |
tree | 139deea916d530f19dda6a2c0f6e1ac28f626314 /src/automount.c | |
parent | e962f5c34f8e292090fa8c7cb265106a621c8735 (diff) |
kmod: automatically load a few kernel modules we need for normal operation before udev is active
Diffstat (limited to 'src/automount.c')
-rw-r--r-- | src/automount.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/automount.c b/src/automount.c index 730b1572c2..32680461c2 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); |