emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak the "pretty lsmod for 2.6" patch to be seperately selectable.

Browse Source 
Patch from Takeharu Kato.
This commit is contained in:
Rob Landley
2005-05-04 23:55:06 +00:00
parent 918f2ab3d7
commit 4f65360a5f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modutils/Config.in
View File

@ -18,6 +18,13 @@ config CONFIG_FEATURE_2_4_MODULES
help help
Support module loading for 2.2.x and 2.4.x Linux kernels. Support module loading for 2.2.x and 2.4.x Linux kernels.
config CONFIG_FEATURE_2_6_MODULES
bool " Support version 2.6.x Linux kernels"
default n
depends on CONFIG_INSMOD
help
Support module loading for newer 2.6.x Linux kernels.
config CONFIG_FEATURE_INSMOD_VERSION_CHECKING config CONFIG_FEATURE_INSMOD_VERSION_CHECKING
bool " Module version checking" bool " Module version checking"
default n default n
@ -73,12 +80,13 @@ config CONFIG_LSMOD
help help
lsmod is used to display a list of loaded modules. lsmod is used to display a list of loaded modules.
config CONFIG_FEATURE_2_6_MODULES config CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
bool " Support version 2.6.x Linux kernels" bool " lsmod pretty output for 2.6.x Linux kernels "
default n default n
depends on CONFIG_INSMOD || CONFIG_LSMOD depends on CONFIG_LSMOD
help help
Support module loading for newer 2.6.x Linux kernels. This option makes output format of lsmod adjusted to
the format of module-init-tools for Linux kernel 2.6.
config CONFIG_FEATURE_QUERY_MODULE_INTERFACE config CONFIG_FEATURE_QUERY_MODULE_INTERFACE
bool bool

3
modutils/lsmod.c
View File

@ -164,7 +164,7 @@ extern int lsmod_main(int argc, char **argv)
{ {
printf("Module Size Used by"); printf("Module Size Used by");
check_tainted(); check_tainted();
#if defined(CONFIG_FEATURE_2_6_MODULES) #if defined(CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT)
{ {
FILE *file; FILE *file;
char line[4096]; char line[4096];
@ -204,6 +204,7 @@ extern int lsmod_main(int argc, char **argv)
} }
fclose(file); fclose(file);
} }
return 0; /* Success */
#else #else
if (bb_xprint_file_by_name("/proc/modules") < 0) { if (bb_xprint_file_by_name("/proc/modules") < 0) {
return 0; return 0;