Fixed up lsmod so it works with my devmodules kernel driver,

and with /proc.
 -Erik

diff --git a/busybox.def.h b/busybox.def.h
index afdc469..561c2ed 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -51,7 +51,7 @@
 //#define BB_LOGGER
 #define BB_LOGNAME
 #define BB_LS
-#define BB_LSMOD
+//#define BB_LSMOD
 //#define BB_MAKEDEVS
 #define BB_MKFS_MINIX
 //#define BB_MATH

diff --git a/lsmod.c b/lsmod.c
index b0b37bd..b8834d3 100644 (file)
--- a/lsmod.c
+++ b/lsmod.c
@@ -25,13 +25,16 @@
 #include <stdio.h>
 
 
-//#if ! defined BB_FEATURE_USE_PROCFS
-//#error Sorry, I depend on the /proc filesystem right now.
-//#endif
-
 extern int lsmod_main(int argc, char **argv)
 {
+#if defined BB_FEATURE_USE_DEVPS_N_DEVMTAB
+       char *cmd[] = { "cat", "/dev/modules", "\0" };
+#else
+#if ! defined BB_FEATURE_USE_PROCFS
+#error Sorry, I depend on the /proc filesystem right now.
+#endif
        char *cmd[] = { "cat", "/proc/modules", "\0" };
+#endif
 
        exit(cat_main(3, cmd));
 }

diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index b0b37bd..b8834d3 100644 (file)
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -25,13 +25,16 @@
 #include <stdio.h>
 
 
-//#if ! defined BB_FEATURE_USE_PROCFS
-//#error Sorry, I depend on the /proc filesystem right now.
-//#endif
-
 extern int lsmod_main(int argc, char **argv)
 {
+#if defined BB_FEATURE_USE_DEVPS_N_DEVMTAB
+       char *cmd[] = { "cat", "/dev/modules", "\0" };
+#else
+#if ! defined BB_FEATURE_USE_PROCFS
+#error Sorry, I depend on the /proc filesystem right now.
+#endif
        char *cmd[] = { "cat", "/proc/modules", "\0" };
+#endif
 
        exit(cat_main(3, cmd));
 }