summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-04 12:32:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-04 12:32:22 +0000
commitea0a79a0da2c6b06abbdcbb060c6d87f6e275db8 (patch)
treec1e65407b1700ab02e67546fed6c321131e96717
parent6ad10258484fe357eead6d62a93475bae6f001b2 (diff)
downloaddrakx-ea0a79a0da2c6b06abbdcbb060c6d87f6e275db8.tar
drakx-ea0a79a0da2c6b06abbdcbb060c6d87f6e275db8.tar.gz
drakx-ea0a79a0da2c6b06abbdcbb060c6d87f6e275db8.tar.bz2
drakx-ea0a79a0da2c6b06abbdcbb060c6d87f6e275db8.tar.xz
drakx-ea0a79a0da2c6b06abbdcbb060c6d87f6e275db8.zip
rename STAGE2_LOCATION_REL into STAGE2_LOCATION_ROOTED
(since STAGE2_LOCATION_REL is not relative, it's simply absolute when chrooted)
-rw-r--r--mdk-stage1/config-stage1.h4
-rw-r--r--mdk-stage1/stage1.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index 4b31f915f..30a303ce8 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -38,7 +38,7 @@
#define IMAGE_LOCATION IMAGE_LOCATION_DIR "cdrom"
#define IMAGE_LOCATION_REAL SLASH_LOCATION "/image"
#define RAW_LOCATION_REL "/cdrom"
-#define STAGE2_LOCATION_REL "/image"
+#define STAGE2_LOCATION_ROOTED "/image"
#define BOOT_LOCATION SLASH_LOCATION "/image_boot"
#define ALWAYS_LOCATION SLASH_LOCATION "/image_always"
#define TOTEM_LOCATION SLASH_LOCATION "/image_totem"
@@ -51,7 +51,7 @@
#define IMAGE_LOCATION_DIR SLASH_LOCATION "/tmp/"
#define IMAGE_LOCATION IMAGE_LOCATION_DIR "image"
#define IMAGE_LOCATION_REAL "/tmp/image"
-#define STAGE2_LOCATION_REL "/tmp/stage2"
+#define STAGE2_LOCATION_ROOTED "/tmp/stage2"
#endif
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index de2dc037b..021437f00 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -388,7 +388,7 @@ enum return_type create_initial_fs(char* symlinks, char* devices)
char oldpath[500], newpath[500], newpathfinal[500];
buf[strlen(buf)-1] = '\0'; // trim \n
if (sscanf(buf, "%s %s", oldpath, newpath) != 2) {
- sprintf(oldpath, "%s%s", STAGE2_LOCATION_REL, buf);
+ sprintf(oldpath, "%s%s", STAGE2_LOCATION_ROOTED, buf);
sprintf(newpathfinal, "%s%s", SLASH_LOCATION, buf);
} else {
sprintf(newpathfinal, "%s%s", SLASH_LOCATION, newpath);
@@ -490,7 +490,7 @@ int mandrake_move_post(void)
return RETURN_ERROR;
} else
// need a fallback in case we don't use image_totem.clp nor live_tree_totem, but we're in -u mode
- if (scall(symlink(STAGE2_LOCATION_REL "/usr", SLASH_LOCATION "/usr"), "symlink"))
+ 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)