diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 13:34:35 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 13:34:35 +0000 |
| commit | 14fea96c0c480153c0c8cda1a2b20f0443b15375 (patch) | |
| tree | f9d61af494ba3ac40dc2310e61834f012df253de | |
| parent | 464ba94fa19ca47073578b9b7f418a2dedd00cc4 (diff) | |
| download | drakx-14fea96c0c480153c0c8cda1a2b20f0443b15375.tar drakx-14fea96c0c480153c0c8cda1a2b20f0443b15375.tar.gz drakx-14fea96c0c480153c0c8cda1a2b20f0443b15375.tar.bz2 drakx-14fea96c0c480153c0c8cda1a2b20f0443b15375.tar.xz drakx-14fea96c0c480153c0c8cda1a2b20f0443b15375.zip | |
replace RAW_LOCATION_REL with IMAGE_LOCATION_REL
(the absolute symlink will now be relative, but that's ok here)
| -rw-r--r-- | mdk-stage1/config-stage1.h | 1 | ||||
| -rw-r--r-- | 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; |