summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-04-17 14:25:04 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-04-17 14:25:04 +0000
commit407a1bed7e0b9f9ae244793827eee0b8f142e903 (patch)
treea9438d3ed6aaac9ec73e0338086fb6c68c42b310
parent9de37557aa1ed32a86a0a799e479e6429da50f44 (diff)
downloaddrakx-407a1bed7e0b9f9ae244793827eee0b8f142e903.tar
drakx-407a1bed7e0b9f9ae244793827eee0b8f142e903.tar.gz
drakx-407a1bed7e0b9f9ae244793827eee0b8f142e903.tar.bz2
drakx-407a1bed7e0b9f9ae244793827eee0b8f142e903.tar.xz
drakx-407a1bed7e0b9f9ae244793827eee0b8f142e903.zip
Handle isohybrid images dumped on usb sticks in stage1
-rw-r--r--mdk-stage1/cdrom.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index eea54594c..3dac3ecf7 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -158,6 +158,13 @@ enum return_type cdrom_prepare(void)
if ((i = try_automatic(medias, medias_models)) != -1)
return do_with_device(medias[i], medias_models[i]);
+ /* detect hybrid isos (isos dumped to an USB stick) */
+ my_insmod("sd_mod", ANY_DRIVER_TYPE, NULL, 0);
+ get_medias(DISK, &medias, &medias_models, BUS_USB);
+ if ((i = try_automatic(medias, medias_models)) != -1) {
+ return do_with_device(medias[i], medias_models[i]);
+ }
+
unset_automatic();
} else
my_insmod("sr_mod", ANY_DRIVER_TYPE, NULL, 0);