From 35b60523ce6b2e32f33dee7a09ce505cc5512be6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 4 Nov 2004 12:16:19 +0000 Subject: LIVE_LOCATION is better named LIVE_LOCATION_REL without the leading "/" --- mdk-stage1/directory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mdk-stage1/directory.c') diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c index 9faa5e1dc..05beed1bc 100644 --- a/mdk-stage1/directory.c +++ b/mdk-stage1/directory.c @@ -160,10 +160,10 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me if (access(IMAGE_LOCATION "/live_tree/etc/fstab", R_OK) && access(IMAGE_LOCATION "/live_tree.clp", R_OK)) { #else char p; - if (access(IMAGE_LOCATION LIVE_LOCATION, R_OK)) { + if (access(IMAGE_LOCATION "/" LIVE_LOCATION_REL, R_OK)) { #endif stg1_error_message("I can't find the " DISTRIB_NAME " Distribution in the specified directory. " - "(I need the subdirectory " LIVE_LOCATION ")\n" + "(I need the subdirectory " LIVE_LOCATION_REL ")\n" "Here's a short extract of the files in the directory:\n" "%s", extract_list_directory(IMAGE_LOCATION)); umount(IMAGE_LOCATION); @@ -171,7 +171,7 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me return RETURN_BACK; } #ifndef MANDRAKE_MOVE - if (readlink(IMAGE_LOCATION LIVE_LOCATION "/usr/bin/runinstall2", &p, 1) != 1) { + if (readlink(IMAGE_LOCATION "/" LIVE_LOCATION_REL "/usr/bin/runinstall2", &p, 1) != 1) { stg1_error_message("The " DISTRIB_NAME " Distribution seems to be copied on a Windows partition. " "You need more memory to perform an installation from a Windows partition. " "Another solution is to copy the " DISTRIB_NAME " Distribution on a Linux partition."); -- cgit v1.2.1