diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 13:59:05 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 13:59:05 +0000 |
| commit | 5b47da161b849bd4c62673965937623d3b4d4d63 (patch) | |
| tree | b047dfb3e6f47631363399fbd24968ae4fc20a9d | |
| parent | 88c5074a657205ea7f4ade61007008090d41044f (diff) | |
| download | drakx-backup-do-not-use-5b47da161b849bd4c62673965937623d3b4d4d63.tar drakx-backup-do-not-use-5b47da161b849bd4c62673965937623d3b4d4d63.tar.gz drakx-backup-do-not-use-5b47da161b849bd4c62673965937623d3b4d4d63.tar.bz2 drakx-backup-do-not-use-5b47da161b849bd4c62673965937623d3b4d4d63.tar.xz drakx-backup-do-not-use-5b47da161b849bd4c62673965937623d3b4d4d63.zip | |
IMAGE_LOCATION_REAL is better named STAGE2_LOCATION in MOVE
| -rw-r--r-- | mdk-stage1/config-stage1.h | 2 | ||||
| -rw-r--r-- | mdk-stage1/stage1.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h index cbb974e51..bb81d08ef 100644 --- a/mdk-stage1/config-stage1.h +++ b/mdk-stage1/config-stage1.h @@ -36,8 +36,8 @@ #define IMAGE_LOCATION_DIR SLASH_LOCATION "/" #define IMAGE_LOCATION_REL "cdrom" #define IMAGE_LOCATION IMAGE_LOCATION_DIR IMAGE_LOCATION_REL -#define IMAGE_LOCATION_REAL SLASH_LOCATION "/image" #define STAGE2_LOCATION_ROOTED "/image" +#define STAGE2_LOCATION SLASH_LOCATION STAGE2_LOCATION_ROOTED #define BOOT_LOCATION SLASH_LOCATION "/image_boot" #define ALWAYS_LOCATION SLASH_LOCATION "/image_always" #define TOTEM_LOCATION SLASH_LOCATION "/image_totem" diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index e5cf76551..07295afb1 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -477,7 +477,7 @@ int mandrake_move_post(void) return RETURN_ERROR; if (handle_clp(IMAGE_LOCATION "/live_tree.clp", IMAGE_LOCATION "/live_tree/etc/fstab", - IMAGE_LOCATION "/live_tree", IMAGE_LOCATION_REAL, + IMAGE_LOCATION "/live_tree", STAGE2_LOCATION, &main__real_is_symlink_to_raw, NULL) != RETURN_OK) return RETURN_ERROR; @@ -493,7 +493,7 @@ int mandrake_move_post(void) if (scall(symlink(STAGE2_LOCATION_ROOTED "/usr", SLASH_LOCATION "/usr"), "symlink")) return RETURN_ERROR; - if (create_initial_fs(IMAGE_LOCATION_REAL "/move/symlinks", IMAGE_LOCATION_REAL "/move/devices") != RETURN_OK) + if (create_initial_fs(STAGE2_LOCATION "/move/symlinks", STAGE2_LOCATION "/move/devices") != RETURN_OK) return RETURN_ERROR; if (boot__real_is_symlink_to_raw) { @@ -518,9 +518,9 @@ int mandrake_move_post(void) } if (main__real_is_symlink_to_raw) { - if (scall(unlink(IMAGE_LOCATION_REAL), "unlink")) + if (scall(unlink(STAGE2_LOCATION), "unlink")) return RETURN_ERROR; - if (scall(symlink(IMAGE_LOCATION_REL "/live_tree", IMAGE_LOCATION_REAL), "symlink")) + if (scall(symlink(IMAGE_LOCATION_REL "/live_tree", STAGE2_LOCATION), "symlink")) return RETURN_ERROR; } return RETURN_OK; |