summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-12-02 19:08:26 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-12-02 19:08:26 +0000
commitdf4589acd9e285e7e16f31e53e0f81777fc1f783 (patch)
tree0cd3fc6e4dac5c7e4d19130e9fdffe068a397e96
parent9928877d7da42d5666fc49059f8b3af8e04e014e (diff)
downloaddrakx-df4589acd9e285e7e16f31e53e0f81777fc1f783.tar
drakx-df4589acd9e285e7e16f31e53e0f81777fc1f783.tar.gz
drakx-df4589acd9e285e7e16f31e53e0f81777fc1f783.tar.bz2
drakx-df4589acd9e285e7e16f31e53e0f81777fc1f783.tar.xz
drakx-df4589acd9e285e7e16f31e53e0f81777fc1f783.zip
I wonder how 9.2 worked in all.rdz!? Thisd did not even call method_select_and_prepare()
-rw-r--r--mdk-stage1/stage1.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index fb50748ce..2bc7f8084 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -613,9 +613,12 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
#endif
#ifndef DISABLE_DISK
- if (IS_RECOVERY && streq(get_auto_value("method"), "cdrom") && !process_recovery())
-#endif
+ if (IS_RECOVERY && streq(get_auto_value("method"), "cdrom")) {
+ if (!process_recovery())
method_select_and_prepare();
+#endif
+ } else
+ method_select_and_prepare();
if (!IS_RAMDISK)
if (symlink(IMAGE_LOCATION_REAL LIVE_LOCATION, STAGE2_LOCATION) != 0)