diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-11 15:10:33 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-11 15:10:33 +0000 |
| commit | 75dbadee24b0bd6b738093b66f8415a630692671 (patch) | |
| tree | 8c2b03dddfa8d55dab163bf035f2d7e595a7eb70 /mdk-stage1/cdrom.c | |
| parent | d7845ac2fcec5db5dc4c6e4a40ad516aa2ef531f (diff) | |
| download | drakx-backup-do-not-use-75dbadee24b0bd6b738093b66f8415a630692671.tar drakx-backup-do-not-use-75dbadee24b0bd6b738093b66f8415a630692671.tar.gz drakx-backup-do-not-use-75dbadee24b0bd6b738093b66f8415a630692671.tar.bz2 drakx-backup-do-not-use-75dbadee24b0bd6b738093b66f8415a630692671.tar.xz drakx-backup-do-not-use-75dbadee24b0bd6b738093b66f8415a630692671.zip | |
week-end stuff: now supports second stage as a ramdisk
adds better device files handling (some in initrd, others dynamically created)
better logging of detected IDE and SCSI devices
Diffstat (limited to 'mdk-stage1/cdrom.c')
| -rw-r--r-- | mdk-stage1/cdrom.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index 1ac84979c..7a43e8ccc 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -59,10 +59,13 @@ static enum return_type try_with_device(char *dev_name) } log_message("found a Linux-Mandrake CDROM, good news!"); -/* - if (special_stage2 || total_memory() > 52 * 1024) loadMdkinstStage2(); - if (rescue) umount("/tmp/rhimage"); -*/ + + if (IS_SPECIAL_STAGE2 || ramdisk_possible()) + load_ramdisk(); /* we don't care about return code, we'll do it live if we failed */ + + if (IS_RESCUE) umount("/tmp/image"); /* TOCHECK */ + + method_name = strdup("cdrom"); return RETURN_OK; } @@ -82,7 +85,6 @@ enum return_type cdrom_prepare(void) ptr = medias; while (ptr && *ptr) { - log_message("have CDROM %s", *ptr); count++; ptr++; } @@ -96,7 +98,6 @@ enum return_type cdrom_prepare(void) } if (count == 1) { - log_message("Only one CDROM detected: %s (%s)", *medias, *medias_models); results = try_with_device(*medias); if (results == RETURN_OK) return RETURN_OK; |