diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-11 18:21:13 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-11 18:21:13 +0000 |
| commit | 78c546d40cff285747ead9c15e5cb5b9496b7164 (patch) | |
| tree | a34f5a92d9daa884bdc4548300057d97f4cff230 /mdk-stage1/cdrom.c | |
| parent | e7d0a4b83de6168fc5294a605a6c97d2467c4d20 (diff) | |
| download | drakx-78c546d40cff285747ead9c15e5cb5b9496b7164.tar drakx-78c546d40cff285747ead9c15e5cb5b9496b7164.tar.gz drakx-78c546d40cff285747ead9c15e5cb5b9496b7164.tar.bz2 drakx-78c546d40cff285747ead9c15e5cb5b9496b7164.tar.xz drakx-78c546d40cff285747ead9c15e5cb5b9496b7164.zip | |
- add FTP
- add HTTP
- use single place for mountpoints and static directories
Diffstat (limited to 'mdk-stage1/cdrom.c')
| -rw-r--r-- | mdk-stage1/cdrom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index 1c400726d..eb5977153 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -41,7 +41,7 @@ static enum return_type try_with_device(char *dev_name) strcpy(device_fullname, "/dev/"); strcat(device_fullname, dev_name); - if (my_mount(device_fullname, "/tmp/image", "iso9660") == -1) { + if (my_mount(device_fullname, IMAGE_LOCATION, "iso9660") == -1) { enum return_type results; unset_param(MODE_AUTOMATIC); /* we are in a fallback mode */ @@ -51,9 +51,9 @@ static enum return_type try_with_device(char *dev_name) return results; } - if (access("/tmp/image" LIVE_LOCATION, R_OK)) { + if (access(IMAGE_LOCATION LIVE_LOCATION, R_OK)) { enum return_type results; - umount("/tmp/image"); + umount(IMAGE_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); @@ -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"); + umount(IMAGE_LOCATION); method_name = strdup("cdrom"); return RETURN_OK; |