summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-04 13:55:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-04 13:55:20 +0000
commitb64fc44a40ae1825df505fd7d6137a244b0fc72f (patch)
tree7c4ed876283cf9e84d3ebbdb4e5806f3c72c9ffb
parent14fea96c0c480153c0c8cda1a2b20f0443b15375 (diff)
downloaddrakx-b64fc44a40ae1825df505fd7d6137a244b0fc72f.tar
drakx-b64fc44a40ae1825df505fd7d6137a244b0fc72f.tar.gz
drakx-b64fc44a40ae1825df505fd7d6137a244b0fc72f.tar.bz2
drakx-b64fc44a40ae1825df505fd7d6137a244b0fc72f.tar.xz
drakx-b64fc44a40ae1825df505fd7d6137a244b0fc72f.zip
LIVE_LOCATION_REL doesn't exist anymore in MOVE
-rw-r--r--mdk-stage1/directory.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c
index 5b0a201ec..fdefac5f1 100644
--- a/mdk-stage1/directory.c
+++ b/mdk-stage1/directory.c
@@ -158,14 +158,18 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me
/* LIVE install */
#ifdef MANDRAKE_MOVE
if (access(IMAGE_LOCATION "/live_tree/etc/fstab", R_OK) && access(IMAGE_LOCATION "/live_tree.clp", R_OK)) {
+ stg1_error_message("I can't find the " DISTRIB_NAME " Distribution in the specified directory. "
+ "(I need the subdirectory " IMAGE_LOCATION ")\n"
+ "Here's a short extract of the files in the directory:\n"
+ "%s", extract_list_directory(IMAGE_LOCATION));
#else
char p;
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_REL ")\n"
"Here's a short extract of the files in the directory:\n"
"%s", extract_list_directory(IMAGE_LOCATION));
+#endif
umount(IMAGE_LOCATION);
del_loop(loopdev);
return RETURN_BACK;