aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-05-03 10:34:35 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-05-03 10:34:35 +0000
commitd2bc11582e09a025eef837b271f38a9d09e6b9f3 (patch)
tree41ef2f48c12bdf044164e7db3d3e2dfba655c0eb
parentf8930ca9e18ca77f0100e60cbecc28dbd1a43c94 (diff)
downloadbusybox-w32-d2bc11582e09a025eef837b271f38a9d09e6b9f3.tar.gz
busybox-w32-d2bc11582e09a025eef837b271f38a9d09e6b9f3.tar.bz2
busybox-w32-d2bc11582e09a025eef837b271f38a9d09e6b9f3.zip
Patch from Robert Griebl <griebl@gmx.de> to ignore the -s flag
git-svn-id: svn://busybox.net/trunk/busybox@4725 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--modutils/insmod.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index cbd423e18..a2d718eb5 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -140,7 +140,7 @@
140#ifndef MODUTILS_MODULE_H 140#ifndef MODUTILS_MODULE_H
141static const int MODUTILS_MODULE_H = 1; 141static const int MODUTILS_MODULE_H = 1;
142 142
143#ident "$Id: insmod.c,v 1.81 2002/04/12 00:28:59 andersen Exp $" 143#ident "$Id: insmod.c,v 1.82 2002/05/03 10:34:35 andersen Exp $"
144 144
145/* This file contains the structures used by the 2.0 and 2.1 kernels. 145/* This file contains the structures used by the 2.0 and 2.1 kernels.
146 We do not use the kernel headers directly because we do not wish 146 We do not use the kernel headers directly because we do not wish
@@ -357,7 +357,7 @@ int delete_module(const char *);
357#ifndef MODUTILS_OBJ_H 357#ifndef MODUTILS_OBJ_H
358static const int MODUTILS_OBJ_H = 1; 358static const int MODUTILS_OBJ_H = 1;
359 359
360#ident "$Id: insmod.c,v 1.81 2002/04/12 00:28:59 andersen Exp $" 360#ident "$Id: insmod.c,v 1.82 2002/05/03 10:34:35 andersen Exp $"
361 361
362/* The relocatable object is manipulated using elfin types. */ 362/* The relocatable object is manipulated using elfin types. */
363 363
@@ -3336,7 +3336,7 @@ extern int insmod_main( int argc, char **argv)
3336#endif 3336#endif
3337 3337
3338 /* Parse any options */ 3338 /* Parse any options */
3339 while ((opt = getopt(argc, argv, "fkvxLo:")) > 0) { 3339 while ((opt = getopt(argc, argv, "fksvxLo:")) > 0) {
3340 switch (opt) { 3340 switch (opt) {
3341 case 'f': /* force loading */ 3341 case 'f': /* force loading */
3342 flag_force_load = 1; 3342 flag_force_load = 1;
@@ -3344,6 +3344,12 @@ extern int insmod_main( int argc, char **argv)
3344 case 'k': /* module loaded by kerneld, auto-cleanable */ 3344 case 'k': /* module loaded by kerneld, auto-cleanable */
3345 flag_autoclean = 1; 3345 flag_autoclean = 1;
3346 break; 3346 break;
3347 case 's': /* log to syslog */
3348 /* log to syslog -- not supported */
3349 /* but kernel needs this for request_module(), */
3350 /* as this calls: modprobe -k -s -- <module> */
3351 /* so silently ignore this flag */
3352 break;
3347 case 'v': /* verbose output */ 3353 case 'v': /* verbose output */
3348 flag_verbose = 1; 3354 flag_verbose = 1;
3349 break; 3355 break;