Follow symbolic links when searching for modules.

diff --git a/insmod.c b/insmod.c
index bc7f6589acfacdfb6d6dcc010221d763b4508ee0..44c34a2e85c2e5e1d486ce2f1eb0fb4235802585 100644 (file)
--- a/insmod.c
+++ b/insmod.c
@@ -124,7 +124,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $"
+#ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -330,7 +330,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $"
+#ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -3182,7 +3182,7 @@ extern int insmod_main( int argc, char **argv)
                        char module_dir[FILENAME_MAX];
                        snprintf (module_dir, sizeof(module_dir), "%s/%s", 
                                        _PATH_MODULES, myuname.release);
-                       recursive_action(module_dir, TRUE, FALSE, FALSE, 
+                       recursive_action(module_dir, TRUE, TRUE, FALSE,
                                        check_module_name_match, 0, m_fullName);
                }
 
@@ -3191,7 +3191,7 @@ extern int insmod_main( int argc, char **argv)
                {
                        /* No module found under /lib/modules/`uname -r`, this
                         * time cast the net a bit wider.  Search /lib/modules/ */
-                       if (recursive_action(_PATH_MODULES, TRUE, FALSE, FALSE,
+                       if (recursive_action(_PATH_MODULES, TRUE, TRUE, FALSE,
                                                check_module_name_match, 0, m_fullName) == FALSE) 
                        {
                                if (m_filename[0] == '\0'

diff --git a/modutils/insmod.c b/modutils/insmod.c
index bc7f6589acfacdfb6d6dcc010221d763b4508ee0..44c34a2e85c2e5e1d486ce2f1eb0fb4235802585 100644 (file)
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -124,7 +124,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $"
+#ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -330,7 +330,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $"
+#ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -3182,7 +3182,7 @@ extern int insmod_main( int argc, char **argv)
                        char module_dir[FILENAME_MAX];
                        snprintf (module_dir, sizeof(module_dir), "%s/%s", 
                                        _PATH_MODULES, myuname.release);
-                       recursive_action(module_dir, TRUE, FALSE, FALSE, 
+                       recursive_action(module_dir, TRUE, TRUE, FALSE,
                                        check_module_name_match, 0, m_fullName);
                }
 
@@ -3191,7 +3191,7 @@ extern int insmod_main( int argc, char **argv)
                {
                        /* No module found under /lib/modules/`uname -r`, this
                         * time cast the net a bit wider.  Search /lib/modules/ */
-                       if (recursive_action(_PATH_MODULES, TRUE, FALSE, FALSE,
+                       if (recursive_action(_PATH_MODULES, TRUE, TRUE, FALSE,
                                                check_module_name_match, 0, m_fullName) == FALSE) 
                        {
                                if (m_filename[0] == '\0'