summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/modules.c
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-23 12:30:30 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-23 12:30:30 +0000
commitc644f2f742157a41f583d3c1d2e2799514500d71 (patch)
treedde68c1c2f2e54f3acbfdda222eacdeaaf473763 /mdk-stage1/modules.c
parent73c757e0a55c903c860f1f6a06ae6c87d3165d2b (diff)
downloaddrakx-backup-do-not-use-c644f2f742157a41f583d3c1d2e2799514500d71.tar
drakx-backup-do-not-use-c644f2f742157a41f583d3c1d2e2799514500d71.tar.gz
drakx-backup-do-not-use-c644f2f742157a41f583d3c1d2e2799514500d71.tar.bz2
drakx-backup-do-not-use-c644f2f742157a41f583d3c1d2e2799514500d71.tar.xz
drakx-backup-do-not-use-c644f2f742157a41f583d3c1d2e2799514500d71.zip
kill long dead argument
the "Additional Drivers floppy" is long dead
Diffstat (limited to 'mdk-stage1/modules.c')
-rw-r--r--mdk-stage1/modules.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index f1fd12130..d3d92ea81 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -300,7 +300,7 @@ int module_already_present(const char * name)
#ifndef ENABLE_NETWORK_STANDALONE
-static enum insmod_return insmod_with_deps(const char * mod_name, char * options, int allow_modules_floppy)
+static enum insmod_return insmod_with_deps(const char * mod_name, char * options)
{
struct module_deps_elem * dep;
const char * filename;
@@ -314,7 +314,7 @@ static enum insmod_return insmod_with_deps(const char * mod_name, char * options
while (*one_dep) {
/* here, we can fail but we don't care, if the error is
* important, the desired module will fail also */
- insmod_with_deps(*one_dep, NULL, allow_modules_floppy);
+ insmod_with_deps(*one_dep, NULL);
one_dep++;
}
}
@@ -338,9 +338,9 @@ static enum insmod_return insmod_with_deps(const char * mod_name, char * options
#ifndef DISABLE_NETWORK
-enum insmod_return my_modprobe(const char * mod_name, enum driver_type type, char * options, int allow_modules_floppy)
+enum insmod_return my_modprobe(const char * mod_name, enum driver_type type, char * options)
#else
-enum insmod_return my_modprobe(const char * mod_name, enum driver_type type __attribute__ ((unused)), char * options, int allow_modules_floppy)
+enum insmod_return my_modprobe(const char * mod_name, enum driver_type type __attribute__ ((unused)), char * options)
#endif
{
int i;
@@ -366,7 +366,7 @@ enum insmod_return my_modprobe(const char * mod_name, enum driver_type type __at
i = system(cmd);
}
#else
- i = insmod_with_deps(mod_name, options, allow_modules_floppy);
+ i = insmod_with_deps(mod_name, options);
#endif
if (i == 0) {
log_message("\tsucceeded %s", mod_name);
@@ -413,7 +413,7 @@ static enum return_type insmod_with_options(char * mod, enum driver_type type)
strcat(options, " ");
strcat(options, answers[0]); // because my_modprobe will eventually modify the string
- if (my_modprobe(mod, type, answers[0], 1) != INSMOD_OK) {
+ if (my_modprobe(mod, type, answers[0]) != INSMOD_OK) {
stg1_error_message("Insmod failed.");
return RETURN_ERROR;
}