diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-03 10:00:48 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-03 10:00:48 +0000 |
| commit | a99ac3f228a40784486b1ea8ed7ba3885a7b8540 (patch) | |
| tree | 9fb511cec88e321886bf31d8b4c613845818cf65 | |
| parent | 63e56c659ec455089815eaf3312d668fe60677e1 (diff) | |
| download | drakx-backup-do-not-use-a99ac3f228a40784486b1ea8ed7ba3885a7b8540.tar drakx-backup-do-not-use-a99ac3f228a40784486b1ea8ed7ba3885a7b8540.tar.gz drakx-backup-do-not-use-a99ac3f228a40784486b1ea8ed7ba3885a7b8540.tar.bz2 drakx-backup-do-not-use-a99ac3f228a40784486b1ea8ed7ba3885a7b8540.tar.xz drakx-backup-do-not-use-a99ac3f228a40784486b1ea8ed7ba3885a7b8540.zip | |
blank.img has been removed, so remove special code handling it
| -rw-r--r-- | mdk-stage1/init-data/msgboot-blank.img.bz2 | bin | 14592 -> 0 bytes | |||
| -rw-r--r-- | mdk-stage1/modules.c | 12 | ||||
| -rw-r--r-- | mdk-stage1/stage1.c | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/mdk-stage1/init-data/msgboot-blank.img.bz2 b/mdk-stage1/init-data/msgboot-blank.img.bz2 Binary files differdeleted file mode 100644 index a572093d9..000000000 --- a/mdk-stage1/init-data/msgboot-blank.img.bz2 +++ /dev/null diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index efabb6e06..efd9efdb8 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -41,7 +41,6 @@ static struct module_deps_elem * modules_deps = NULL; static char archive_name[] = "/modules/modules.mar"; static char additional_archive_name[] = "/tmp/tmpfs/modules.mar"; -int disable_modules = 0; int allow_additional_modules_floppy = 1; extern long init_module(void *, unsigned long, const char *); @@ -301,8 +300,7 @@ static int load_modules_dependencies(void) void init_modules_insmoding(void) { if (load_modules_dependencies()) { - log_message("warning, error initing modules stuff, modules loading disabled"); - disable_modules = 1; + fatal_error("warning, error initing modules stuff, modules loading disabled"); } } @@ -425,11 +423,6 @@ enum insmod_return my_insmod(const char * mod_name, enum driver_type type __attr log_message("have to insmod %s", real_mod_name); - if (disable_modules) { - log_message("\tdisabled"); - return INSMOD_OK; - } - #ifndef DISABLE_NETWORK if (type == NETWORK_DEVICES) net_devices = get_net_devices(); @@ -510,9 +503,6 @@ enum return_type ask_insmod(enum driver_type type) else return RETURN_ERROR; - if (disable_modules) - return RETURN_BACK; - snprintf(msg, sizeof(msg), "Which driver should I try to gain %s access?", mytype); { diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 4d90496cc..0cc70490b 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -655,8 +655,6 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) *argptr++ = pcmcia_adapter; } #endif - if (disable_modules) - *argptr++ = "--blank"; if (stage2_kickstart) { *argptr++ = "--kickstart"; *argptr++ = stage2_kickstart; |