From: Erik Andersen <andersen@codepoet.org>
Date: Wed, 8 Mar 2000 06:42:34 +0000 (-0000)
Subject: Fixed up lsmod so it works with my devmodules kernel driver,
X-Git-Tag: 0_43pre1~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54969a1f6443b98c6874bd611de89b9ce30ca116;p=oweals%2Fbusybox.git

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 afdc46971..561c2ed4b 100644
--- 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 b0b37bdd7..b8834d304 100644
--- 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 b0b37bdd7..b8834d304 100644
--- 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));
 }