From 44aa510b36ea451da6a21d7c6d6aa7a9870684f2 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Mon, 18 Dec 2000 12:00:04 +0000 Subject: nice handle of automatic mode for cdrom install --- mdk-stage1/cdrom.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'mdk-stage1/cdrom.c') 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; -- cgit v1.2.1