summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/cdrom.c
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-01-09 16:53:41 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-01-09 16:53:41 +0000
commitd8ac7baab24e48621dd8524321f3cccbbcb5395f (patch)
tree48e9b969642f4332519217303fa09a35efb7b37a /mdk-stage1/cdrom.c
parente7df17b04c746abfa66ff22f9ace9e6211a716c8 (diff)
downloaddrakx-d8ac7baab24e48621dd8524321f3cccbbcb5395f.tar
drakx-d8ac7baab24e48621dd8524321f3cccbbcb5395f.tar.gz
drakx-d8ac7baab24e48621dd8524321f3cccbbcb5395f.tar.bz2
drakx-d8ac7baab24e48621dd8524321f3cccbbcb5395f.tar.xz
drakx-d8ac7baab24e48621dd8524321f3cccbbcb5395f.zip
- disk install can now load the second stage ramdisk, included pixel's readlink test to cut vfat problems
- disabled TOCHECK's for rescue/umounting stuff
Diffstat (limited to 'mdk-stage1/cdrom.c')
-rw-r--r--mdk-stage1/cdrom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index d5f8aafa3..1c400726d 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -51,7 +51,7 @@ static enum return_type try_with_device(char *dev_name)
return results;
}
- if (access("/tmp/image/Mandrake/mdkinst", R_OK)) {
+ if (access("/tmp/image" LIVE_LOCATION, R_OK)) {
enum return_type results;
umount("/tmp/image");
results = ask_yes_no("That CDROM disc does not seem to be a " DISTRIB_NAME " Installation CDROM.\nRetry with another disc?");
@@ -66,7 +66,7 @@ static enum return_type try_with_device(char *dev_name)
load_ramdisk(); /* we don't care about return code, we'll do it live if we failed */
if (IS_RESCUE)
- umount("/tmp/image"); /* TOCHECK */
+ umount("/tmp/image");
method_name = strdup("cdrom");
return RETURN_OK;