diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-07-26 13:12:39 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-07-26 13:12:39 +0000 |
| commit | 075a84707c35ef9191dc3e26dce54fa24a0646f7 (patch) | |
| tree | 898905a7f608327098eeca875197657953640cb3 /mdk-stage1 | |
| parent | 63988b80f512c1fd6120528e05c02fe7f9b70782 (diff) | |
| download | drakx-075a84707c35ef9191dc3e26dce54fa24a0646f7.tar drakx-075a84707c35ef9191dc3e26dce54fa24a0646f7.tar.gz drakx-075a84707c35ef9191dc3e26dce54fa24a0646f7.tar.bz2 drakx-075a84707c35ef9191dc3e26dce54fa24a0646f7.tar.xz drakx-075a84707c35ef9191dc3e26dce54fa24a0646f7.zip | |
pass "--blank" to DrakX when module loading is disabled
Diffstat (limited to 'mdk-stage1')
| -rw-r--r-- | mdk-stage1/modules.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/modules.h | 2 | ||||
| -rw-r--r-- | mdk-stage1/stage1.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index fac10ba47..802f39b18 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -39,7 +39,7 @@ static struct module_deps_elem * modules_deps = NULL; static char * archive_name = "/modules/modules.mar"; -static int disable_modules = 0; +int disable_modules = 0; /* unarchive and insmod given module diff --git a/mdk-stage1/modules.h b/mdk-stage1/modules.h index bbbac2ef5..a5fccb609 100644 --- a/mdk-stage1/modules.h +++ b/mdk-stage1/modules.h @@ -30,6 +30,6 @@ struct module_deps_elem { char ** deps; }; - +extern int disable_modules; #endif diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 85520e6a8..e06bf99a1 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -419,6 +419,8 @@ int main(int argc, char **argv, char **env) *argptr++ = "--pcmcia"; *argptr++ = pcmcia_adapter; } + if (disable_modules) + *argptr++ = "--blank"; *argptr++ = NULL; execve(stage2_args[0], stage2_args, grab_env()); |