svn commit: trunk/busybox: include modutils

vda at busybox.net vda at busybox.net
Mon Sep 24 20:14:33 UTC 2007


Author: vda
Date: 2007-09-24 13:14:32 -0700 (Mon, 24 Sep 2007)
New Revision: 19997

Log:
insmod: fix help text to not show options if only 2.6 was selected



Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/modutils/insmod.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2007-09-24 19:54:36 UTC (rev 19996)
+++ trunk/busybox/include/usage.h	2007-09-24 20:14:32 UTC (rev 19997)
@@ -1584,9 +1584,10 @@
 "	::shutdown:/sbin/swapoff -a\n"
 
 #define insmod_trivial_usage \
-       "[OPTION]... MODULE [symbol=value]..."
+	USE_FEATURE_2_4_MODULES("[OPTION]... ") "MODULE [symbol=value]..."
 #define insmod_full_usage \
        "Load the specified kernel modules into the kernel" \
+	USE_FEATURE_2_4_MODULES( \
        "\n\nOptions:\n" \
        "	-f	Force module to load into the wrong kernel version\n" \
        "	-k	Make module autoclean-able\n" \
@@ -1594,9 +1595,11 @@
        "	-q	Quiet\n" \
        "	-L	Lock to prevent simultaneous loads of a module\n" \
 	USE_FEATURE_INSMOD_LOAD_MAP( \
-       "	-m	Output load map to stdout\n") \
+       "	-m	Output load map to stdout\n" \
+	) \
        "	-o NAME	Set internal module name to NAME\n" \
-       "	-x	Do not export externs"
+       "	-x	Do not export externs" \
+	)
 
 #define install_trivial_usage \
        "[-cgmops] [sources] dest|directory"

Modified: trunk/busybox/modutils/insmod.c
===================================================================
--- trunk/busybox/modutils/insmod.c	2007-09-24 19:54:36 UTC (rev 19996)
+++ trunk/busybox/modutils/insmod.c	2007-09-24 20:14:32 UTC (rev 19997)
@@ -72,7 +72,7 @@
 #endif
 
 #if ENABLE_FEATURE_2_6_MODULES
-extern int insmod_ng_main( int argc, char **argv);
+extern int insmod_ng_main(int argc, char **argv);
 #endif
 
 




More information about the busybox-cvs mailing list