summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/cdrom.c
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-10-16 18:02:32 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-10-16 18:02:32 +0000
commit1d35994e040d8000f6b851bad43073f1b27a6d9b (patch)
treecc14d3692be5b7fc7230d3b30d9fc5bba09f6488 /mdk-stage1/cdrom.c
parent93e552dd13d359b393c6a955603892a2b121e385 (diff)
downloaddrakx-backup-do-not-use-1d35994e040d8000f6b851bad43073f1b27a6d9b.tar
drakx-backup-do-not-use-1d35994e040d8000f6b851bad43073f1b27a6d9b.tar.gz
drakx-backup-do-not-use-1d35994e040d8000f6b851bad43073f1b27a6d9b.tar.bz2
drakx-backup-do-not-use-1d35994e040d8000f6b851bad43073f1b27a6d9b.tar.xz
drakx-backup-do-not-use-1d35994e040d8000f6b851bad43073f1b27a6d9b.zip
mandrake-move is cloop stuff
Diffstat (limited to 'mdk-stage1/cdrom.c')
-rw-r--r--mdk-stage1/cdrom.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index 8fc4868d4..8c136c125 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -48,7 +48,7 @@ static int mount_that_cd_device(char * dev_name)
static int test_that_cd()
{
#ifdef MANDRAKE_MOVE
- return access(IMAGE_LOCATION "/usr/bin/runstage2", R_OK);
+ return access(IMAGE_LOCATION "/live_tree.clp", R_OK);
#else
return access(IMAGE_LOCATION LIVE_LOCATION, R_OK);
#endif
@@ -73,6 +73,10 @@ static enum return_type do_with_device(char * dev_name, char * dev_model)
#ifndef MANDRAKE_MOVE
if (IS_SPECIAL_STAGE2 || ramdisk_possible())
load_ramdisk(); /* we don't care about return code, we'll do it live if we failed */
+#else
+ my_insmod("cloop", ANY_DRIVER_TYPE, "file=" IMAGE_LOCATION "/live_tree.clp");
+ if (my_mount("/dev/cloop0", IMAGE_LOCATION_REAL, "iso9660", 0))
+ stg1_error_message("Could not mount compressed loopback :(.");
#endif
if (IS_RESCUE)