| From 2cbc576ea1fbd1cbf4579d64b30e41d762084e7f Mon Sep 17 00:00:00 2001 |
| From: "yanjun.zhu" <yanjun.zhu@windriver.com> |
| Date: Tue, 15 Jan 2013 12:45:44 +0800 |
| Subject: [PATCH] autofs: do not check for modprobe |
| |
| Description: Loading autofs module is #ifdef'ed in the source, so |
| there is no need to check for /proc (which is only used |
| to load module) or modprobe. Both modprobe and /proc |
| are always in the fixed location so there's no need to |
| check for these to start with. |
| |
| Upstream-Status: Backport [1] |
| [1] http://www.spinics.net/lists/autofs/msg00139.html |
| |
| --- |
| configure.in | 6 ------ |
| daemon/module.c | 3 +++ |
| include/automount.h | 11 +++-------- |
| 3 files changed, 6 insertions(+), 14 deletions(-) |
| |
| diff --git a/configure.in b/configure.in |
| index 44a1c8b..b226236 100644 |
| --- a/configure.in |
| +++ b/configure.in |
| @@ -34,11 +34,6 @@ AC_MSG_CHECKING([for binaries in]) |
| AC_MSG_RESULT([$searchpath]) |
| |
| # |
| -# Make sure we have "/proc" |
| -# |
| -AF_LINUX_PROCFS() |
| - |
| -# |
| # Location of init.d directory? |
| # |
| AF_INIT_D() |
| @@ -142,7 +137,6 @@ AF_PATH_INCLUDE(UMOUNT, umount, /bin/umount, $searchpath) |
| AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $searchpath) |
| AF_PATH_INCLUDE(E3FSCK, fsck.ext3 e3fsck, , $searchpath) |
| AF_PATH_INCLUDE(E4FSCK, fsck.ext4 e4fsck, , $searchpath) |
| -AF_PATH_INCLUDE(MODPROBE, modprobe, , $searchpath) |
| |
| AF_CHECK_PROG(LEX, flex lex, , $searchpath) |
| AF_CHECK_PROG(YACC, bison, , $searchpath) |
| diff --git a/daemon/module.c b/daemon/module.c |
| index bed8f7a..e41a98e 100644 |
| --- a/daemon/module.c |
| +++ b/daemon/module.c |
| @@ -19,6 +19,8 @@ |
| #include "automount.h" |
| #include "nsswitch.h" |
| |
| +#if 0 |
| +/* see comment in daemon/automount.c around load_autofs4_module() call */ |
| int load_autofs4_module(void) |
| { |
| FILE *fp; |
| @@ -53,6 +55,7 @@ int load_autofs4_module(void) |
| |
| return 1; |
| } |
| +#endif |
| |
| int open_lookup(const char *name, const char *err_prefix, const char *mapfmt, |
| int argc, const char *const *argv, struct lookup_mod **lookup) |
| diff --git a/include/automount.h b/include/automount.h |
| index c0f5fbf..cc336ad 100644 |
| --- a/include/automount.h |
| +++ b/include/automount.h |
| @@ -51,16 +51,11 @@ |
| #error Failed to locate umount(8)! |
| #endif |
| |
| -#ifndef HAVE_MODPROBE |
| -#error Failed to locate modprobe(8)! |
| -#endif |
| - |
| -#ifndef HAVE_LINUX_PROCFS |
| -#error Failed to verify existence of procfs filesystem! |
| -#endif |
| - |
| +#if 0 |
| +/* see comment in daemon/automount.c around load_autofs4_module() call */ |
| #define FS_MODULE_NAME "autofs4" |
| int load_autofs4_module(void); |
| +#endif |
| |
| /* The -s (sloppy) option to mount is good, if we have it... */ |
| |