diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-12 21:05:30 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-12 21:05:30 +0000 |
| commit | 2b2914cc04a93ca362e4eb3663061c3039aa4049 (patch) | |
| tree | 3f8dbeae1bc114e58f3246cd76b9b0156392b720 /mdk-stage1/cdrom.c | |
| parent | 7852f76ee05551c05a4f833f9a55bec15f44f85d (diff) | |
| download | drakx-backup-do-not-use-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar drakx-backup-do-not-use-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar.gz drakx-backup-do-not-use-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar.bz2 drakx-backup-do-not-use-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar.xz drakx-backup-do-not-use-2b2914cc04a93ca362e4eb3663061c3039aa4049.zip | |
- add pci probing feature
- add listing of available modules and insmod'ing on user request
- make rescue-stage2 working
Diffstat (limited to 'mdk-stage1/cdrom.c')
| -rw-r--r-- | mdk-stage1/cdrom.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index 7a43e8ccc..901d4ac5c 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -49,7 +49,7 @@ static enum return_type try_with_device(char *dev_name) return results; } - if (access("/tmp/image/Mandrake", R_OK)) { + if (access("/tmp/image/Mandrake/mdkinst", R_OK)) { enum return_type results; umount("/tmp/image"); results = ask_yes_no("That CDROM disc does not seem to be a Linux-Mandrake Installation CDROM.\nRetry with another disc?"); @@ -78,10 +78,8 @@ enum return_type cdrom_prepare(void) my_insmod("ide-cd"); my_insmod("sr_mod"); - my_insmod("isofs"); - medias = get_medias(CDROM, QUERY_NAME); - medias_models = get_medias(CDROM, QUERY_MODEL); + get_medias(CDROM, &medias, &medias_models); ptr = medias; while (ptr && *ptr) { @@ -91,7 +89,7 @@ enum return_type cdrom_prepare(void) if (count == 0) { error_message("No CDROM device found."); - i = ask_scsi_insmod(); + i = ask_insmod(SCSI_ADAPTERS); if (i == RETURN_BACK) return RETURN_BACK; return cdrom_prepare(); @@ -101,7 +99,7 @@ enum return_type cdrom_prepare(void) results = try_with_device(*medias); if (results == RETURN_OK) return RETURN_OK; - i = ask_scsi_insmod(); + i = ask_insmod(SCSI_ADAPTERS); if (i == RETURN_BACK) return RETURN_BACK; return cdrom_prepare(); @@ -115,7 +113,7 @@ enum return_type cdrom_prepare(void) results = try_with_device(choice); if (results == RETURN_OK) return RETURN_OK; - i = ask_scsi_insmod(); + i = ask_insmod(SCSI_ADAPTERS); if (i == RETURN_BACK) return RETURN_BACK; return cdrom_prepare(); |