summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-01-11 22:13:58 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-01-11 22:13:58 +0000
commit3f2fff95386862944f1e9cd1e29a7b3709802539 (patch)
tree45f12f74ce9c9ff44b747fda3ef013798da52688 /mdk-stage1
parentde59f070372d5a5e782a5e703a6e2003d47f7bd2 (diff)
downloaddrakx-3f2fff95386862944f1e9cd1e29a7b3709802539.tar
drakx-3f2fff95386862944f1e9cd1e29a7b3709802539.tar.gz
drakx-3f2fff95386862944f1e9cd1e29a7b3709802539.tar.bz2
drakx-3f2fff95386862944f1e9cd1e29a7b3709802539.tar.xz
drakx-3f2fff95386862944f1e9cd1e29a7b3709802539.zip
continue anyway when insmod'ing of modules fail (for blank.img)
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/lomount.c5
-rw-r--r--mdk-stage1/modules.c8
-rw-r--r--mdk-stage1/stage1.c2
3 files changed, 7 insertions, 8 deletions
diff --git a/mdk-stage1/lomount.c b/mdk-stage1/lomount.c
index 7150694d1..232ef57ce 100644
--- a/mdk-stage1/lomount.c
+++ b/mdk-stage1/lomount.c
@@ -131,10 +131,7 @@ lomount(char *loopfile, char *where)
flag = MS_MGC_VAL;
flag |= MS_RDONLY;
- if (my_insmod("loop", ANY_DRIVER_TYPE, NULL)) {
- log_message("can't lomount without loop.o kernel driver");
- return 1;
- }
+ my_insmod("loop", ANY_DRIVER_TYPE, NULL);
if (set_loop(loopdev, loopfile)) {
log_message("set_loop failed on %s (%s)\n", loopdev, strerror(errno));
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 5e3d26ee9..ddb5c6a4c 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -264,7 +264,9 @@ int my_insmod(const char * mod_name, enum driver_type type, char * options)
}
}
#endif
- }
+ } else
+ log_message("warning, insmod failed (%s %s)", mod_name, options);
+
return i;
}
@@ -283,8 +285,8 @@ static enum return_type insmod_with_options(char * mod, enum driver_type type)
strcat(options, mod);
strcat(options, " ");
strcat(options, answers[0]); // because my_insmod will eventually modify the string
-
- if (my_insmod(mod, type, answers[0])) {
+
+ if (my_insmod(mod, type, answers[0])) {
error_message("Insmod failed.");
return RETURN_ERROR;
}
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index d18d0d93a..818e8458c 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -192,7 +192,7 @@ int main(int argc, char **argv, char **env)
handle_env(env);
spawn_shell();
if (load_modules_dependencies())
- fatal_error("could not open and parse modules dependencies");
+ log_message("warning, could not open and parse modules dependencies");
init_frontend();
ret = method_select_and_prepare();