diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
| commit | 126777bc019a54afb4ec51299f2cf9d2841698aa (patch) | |
| tree | 97f76e571902ead55ba138f1156a4b4f00b9b779 /mdk-stage1/cdrom.c | |
| parent | f1f67448efc714873378dfeb8279fae68054a90a (diff) | |
| download | drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2 drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.zip | |
re-sync after the big svn loss
Diffstat (limited to 'mdk-stage1/cdrom.c')
| -rw-r--r-- | mdk-stage1/cdrom.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index e951d35c3..199b1d830 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -37,14 +37,13 @@ static int mount_that_cd_device(char * dev_name) { char device_fullname[50]; + int mount_result; snprintf(device_fullname, sizeof(device_fullname), "/dev/%s", dev_name); -#ifdef MANDRAKE_MOVE - return my_mount(device_fullname, IMAGE_LOCATION, "supermount", 0); -#else - return my_mount(device_fullname, IMAGE_LOCATION, "iso9660", 0); -#endif + mount_result = my_mount(device_fullname, MEDIA_LOCATION, "iso9660", 0); + symlink(MEDIA_LOCATION_REL "/" ARCH, IMAGE_LOCATION); + return mount_result; } @@ -54,7 +53,7 @@ static enum return_type do_with_device(char * dev_name, char * dev_model) { if (!image_has_stage2()) { enum return_type results; - umount(IMAGE_LOCATION); + umount(MEDIA_LOCATION); results = ask_yes_no("That CDROM disc does not seem to be a " DISTRIB_NAME " Installation CDROM.\nRetry with another disc?"); if (results == RETURN_OK) return try_with_device(dev_name, dev_model); @@ -63,13 +62,11 @@ static enum return_type do_with_device(char * dev_name, char * dev_model) log_message("found a " DISTRIB_NAME " CDROM, good news!"); -#ifndef MANDRAKE_MOVE - may_load_clp(); + may_load_compressed_image(); if (!KEEP_MOUNTED) /* in rescue mode, we don't need the media anymore */ - umount(IMAGE_LOCATION); -#endif + umount(MEDIA_LOCATION); add_to_env("METHOD", "cdrom"); return RETURN_OK; @@ -117,7 +114,7 @@ int try_automatic(char ** medias, char ** medias_models) return i; } else - umount(IMAGE_LOCATION); + umount(MEDIA_LOCATION); } remove_wait_message(); @@ -144,6 +141,10 @@ enum return_type cdrom_prepare(void) if ((i = try_automatic(medias, medias_models)) != -1) return do_with_device(medias[i], medias_models[i]); + get_medias(CDROM, &medias, &medias_models, BUS_PCMCIA); + if ((i = try_automatic(medias, medias_models)) != -1) + return do_with_device(medias[i], medias_models[i]); + my_insmod("sr_mod", ANY_DRIVER_TYPE, NULL, 0); get_medias(CDROM, &medias, &medias_models, BUS_SCSI); if ((i = try_automatic(medias, medias_models)) != -1) |