summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/directory.c
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-05 13:27:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-05 13:27:02 +0000
commitb25b64e526e281cd04719d8f0765b445241117e5 (patch)
tree76810b02f32ba634c2ba712fedd9491c1e20b4d3 /mdk-stage1/directory.c
parentf3985ec83c291a8fd09d1147219a5c67905783fc (diff)
downloaddrakx-b25b64e526e281cd04719d8f0765b445241117e5.tar
drakx-b25b64e526e281cd04719d8f0765b445241117e5.tar.gz
drakx-b25b64e526e281cd04719d8f0765b445241117e5.tar.bz2
drakx-b25b64e526e281cd04719d8f0765b445241117e5.tar.xz
drakx-b25b64e526e281cd04719d8f0765b445241117e5.zip
- if you give nfs directory xxx, try to use xxx/ARCH
- handle cdroms with and without ARCH at the root and factorize the code into create_IMAGE_LOCATION()
Diffstat (limited to 'mdk-stage1/directory.c')
-rw-r--r--mdk-stage1/directory.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c
index 3c644f379..21d9fc1a1 100644
--- a/mdk-stage1/directory.c
+++ b/mdk-stage1/directory.c
@@ -141,10 +141,7 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me
add_to_env("ISOPATH", location_full);
add_to_env("METHOD", method_iso);
} else {
- int offset = strncmp(location_full, IMAGE_LOCATION_DIR, sizeof(IMAGE_LOCATION_DIR) - 1) == 0 ? sizeof(IMAGE_LOCATION_DIR) - 1 : 0;
- log_message("assuming %s is a mirror tree", location_full + offset);
-
- symlink(location_full + offset, IMAGE_LOCATION);
+ create_IMAGE_LOCATION(location_full);
add_to_env("METHOD", method_live);
}