summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-05 13:53:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-05 13:53:41 +0000
commit359e3af375c009d03a6836baf1d558ff83d5ac3c (patch)
treea2211335772f4ebac34f61a54a8d3e0491a6c0b2
parent7df683409a22ecfdf576fb307ce9f015a4ac53d9 (diff)
downloaddrakx-359e3af375c009d03a6836baf1d558ff83d5ac3c.tar
drakx-359e3af375c009d03a6836baf1d558ff83d5ac3c.tar.gz
drakx-359e3af375c009d03a6836baf1d558ff83d5ac3c.tar.bz2
drakx-359e3af375c009d03a6836baf1d558ff83d5ac3c.tar.xz
drakx-359e3af375c009d03a6836baf1d558ff83d5ac3c.zip
RAMDISK_LOCATION_REL is a better name than RAMDISK_LOCATION
-rw-r--r--mdk-stage1/config-stage1.h2
-rw-r--r--mdk-stage1/directory.c4
-rw-r--r--mdk-stage1/tools.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index e908ff1aa..df0646855 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -27,7 +27,7 @@
#define RAMDISK_COMPRESSION_RATIO 1.95
-#define RAMDISK_LOCATION "/install/stage2/"
+#define RAMDISK_LOCATION_REL "install/stage2/"
#define SLASH_LOCATION "/sysroot"
#ifdef MANDRAKE_MOVE
diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c
index e1535c6e3..b8ced9cff 100644
--- a/mdk-stage1/directory.c
+++ b/mdk-stage1/directory.c
@@ -145,9 +145,9 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me
#ifndef MANDRAKE_MOVE
if (IS_RESCUE || ((loopdev || streq(method_live, "disk")) && ramdisk_possible())) {
/* RAMDISK install */
- if (access(IMAGE_LOCATION RAMDISK_LOCATION, R_OK)) {
+ if (access(IMAGE_LOCATION "/" RAMDISK_LOCATION_REL, R_OK)) {
stg1_error_message("I can't find the " DISTRIB_NAME " Distribution in the specified directory. "
- "(I need the subdirectory " RAMDISK_LOCATION ")\n"
+ "(I need the subdirectory " RAMDISK_LOCATION_REL ")\n"
"Here's a short extract of the files in the directory:\n"
"%s", extract_list_directory(IMAGE_LOCATION));
umount(IMAGE_LOCATION);
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index 49d72dd9e..a458b075f 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -431,7 +431,7 @@ char * get_ramdisk_realname(void)
{
char img_name[500];
- strcpy(img_name, RAMDISK_LOCATION);
+ strcpy(img_name, "/" RAMDISK_LOCATION_REL);
strcat(img_name, IS_RESCUE ? "rescue" : "mdkinst");
strcat(img_name, "_stage2.bz2");