From 14fea96c0c480153c0c8cda1a2b20f0443b15375 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 4 Nov 2004 13:34:35 +0000 Subject: replace RAW_LOCATION_REL with IMAGE_LOCATION_REL (the absolute symlink will now be relative, but that's ok here) --- mdk-stage1/config-stage1.h | 1 - mdk-stage1/stage1.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h index b4a6105b6..46ba3faaa 100644 --- a/mdk-stage1/config-stage1.h +++ b/mdk-stage1/config-stage1.h @@ -38,7 +38,6 @@ #define IMAGE_LOCATION_REL "cdrom" #define IMAGE_LOCATION IMAGE_LOCATION_DIR IMAGE_LOCATION_REL #define IMAGE_LOCATION_REAL SLASH_LOCATION "/image" -#define RAW_LOCATION_REL "/cdrom" #define STAGE2_LOCATION_ROOTED "/image" #define BOOT_LOCATION SLASH_LOCATION "/image_boot" #define ALWAYS_LOCATION SLASH_LOCATION "/image_always" diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 6c47a644b..e5cf76551 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -499,28 +499,28 @@ int mandrake_move_post(void) if (boot__real_is_symlink_to_raw) { if (scall(unlink(BOOT_LOCATION), "unlink")) return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree_boot", BOOT_LOCATION), "symlink")) + if (scall(symlink(IMAGE_LOCATION_REL "/live_tree_boot", BOOT_LOCATION), "symlink")) return RETURN_ERROR; } if (always__real_is_symlink_to_raw) { if (scall(unlink(ALWAYS_LOCATION), "unlink")) return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree_always", ALWAYS_LOCATION), "symlink")) + if (scall(symlink(IMAGE_LOCATION_REL "/live_tree_always", ALWAYS_LOCATION), "symlink")) return RETURN_ERROR; } if (totem__real_is_symlink_to_raw) { if (scall(unlink(TOTEM_LOCATION), "unlink")) return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree_totem", TOTEM_LOCATION), "symlink")) + if (scall(symlink(IMAGE_LOCATION_REL "/live_tree_totem", TOTEM_LOCATION), "symlink")) return RETURN_ERROR; } if (main__real_is_symlink_to_raw) { if (scall(unlink(IMAGE_LOCATION_REAL), "unlink")) return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree", IMAGE_LOCATION_REAL), "symlink")) + if (scall(symlink(IMAGE_LOCATION_REL "/live_tree", IMAGE_LOCATION_REAL), "symlink")) return RETURN_ERROR; } return RETURN_OK; -- cgit v1.2.1