summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/cdrom.c
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2000-12-18 12:00:04 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2000-12-18 12:00:04 +0000
commit44aa510b36ea451da6a21d7c6d6aa7a9870684f2 (patch)
treeba0ef0ce0c3052ab86f907ba17cc73e4e7de3be7 /mdk-stage1/cdrom.c
parente5b4ea994b4cf66d418494d33abd89300d291c6d (diff)
downloaddrakx-44aa510b36ea451da6a21d7c6d6aa7a9870684f2.tar
drakx-44aa510b36ea451da6a21d7c6d6aa7a9870684f2.tar.gz
drakx-44aa510b36ea451da6a21d7c6d6aa7a9870684f2.tar.bz2
drakx-44aa510b36ea451da6a21d7c6d6aa7a9870684f2.tar.xz
drakx-44aa510b36ea451da6a21d7c6d6aa7a9870684f2.zip
nice handle of automatic mode for cdrom install
Diffstat (limited to 'mdk-stage1/cdrom.c')
-rw-r--r--mdk-stage1/cdrom.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index ba985f563..44e0b85fc 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -106,14 +106,21 @@ enum return_type cdrom_prepare(void)
return cdrom_prepare();
}
- results = ask_from_list_comments("Please choose the CDROM drive to use for the installation.", medias, medias_models, &choice);
-
- if (results != RETURN_OK)
+ if (IS_AUTOMATIC) {
+ results = try_with_device(*medias);
+ if (results != RETURN_OK)
+ unset_param(MODE_AUTOMATIC);
return results;
-
+ }
+ else
+ results = ask_from_list_comments("Please choose the CDROM drive to use for the installation.", medias, medias_models, &choice);
+
results = try_with_device(choice);
if (results == RETURN_OK)
return RETURN_OK;
+ if (results == RETURN_BACK)
+ return cdrom_prepare();
+
i = ask_insmod(SCSI_ADAPTERS);
if (i == RETURN_BACK)
return RETURN_BACK;