diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-02-12 10:40:57 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-02-12 10:40:57 +0000 |
| commit | 088b6a686d887e02739c34736520715f737fe0c5 (patch) | |
| tree | ab49f67231d4947208ef03bfb96136c8e1e00a53 | |
| parent | d0d89fbf3007ee1a019da895af1d5bb32676bca1 (diff) | |
| download | drakx-088b6a686d887e02739c34736520715f737fe0c5.tar drakx-088b6a686d887e02739c34736520715f737fe0c5.tar.gz drakx-088b6a686d887e02739c34736520715f737fe0c5.tar.bz2 drakx-088b6a686d887e02739c34736520715f737fe0c5.tar.xz drakx-088b6a686d887e02739c34736520715f737fe0c5.zip | |
try to use arch-prefixed location for automatic disk installs
| -rw-r--r-- | mdk-stage1/NEWS | 2 | ||||
| -rw-r--r-- | mdk-stage1/disk.c | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index cca2debc9..a6d16d8d0 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,5 @@ +- try to use arch-prefixed location for automatic disk installs + 1.33: - build fix for glibc 2.8 - sort modules in the interface diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index acdc1efaf..d8f26d3a6 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -48,12 +48,15 @@ static enum return_type try_automatic_with_partition(char *dev) { wait_message("Trying to access " DISTRIB_NAME " disk (partition %s)", dev); mounted = !try_mount(dev, MEDIA_LOCATION); remove_wait_message(); - if (mounted && !access(MEDIA_LOCATION "/" COMPRESSED_LOCATION_REL, R_OK)) { - results = try_with_directory(MEDIA_LOCATION, "disk", "disk-iso"); - if (results == RETURN_OK) { - if (!KEEP_MOUNTED) - umount(MEDIA_LOCATION); - return RETURN_OK; + if (mounted) { + create_IMAGE_LOCATION(MEDIA_LOCATION); + if (image_has_stage2()) { + results = try_with_directory(MEDIA_LOCATION, "disk", "disk-iso"); + if (results == RETURN_OK) { + if (!KEEP_MOUNTED) + umount(MEDIA_LOCATION); + return RETURN_OK; + } } } if (mounted) |