summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-10-16 18:31:29 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-10-16 18:31:29 +0000
commitd75bd538928cccfc63e0ea0a7d69c647312c5225 (patch)
tree630c84852448ffc3ce625e41039019dd174130d8 /mdk-stage1
parent1d35994e040d8000f6b851bad43073f1b27a6d9b (diff)
downloaddrakx-d75bd538928cccfc63e0ea0a7d69c647312c5225.tar
drakx-d75bd538928cccfc63e0ea0a7d69c647312c5225.tar.gz
drakx-d75bd538928cccfc63e0ea0a7d69c647312c5225.tar.bz2
drakx-d75bd538928cccfc63e0ea0a7d69c647312c5225.tar.xz
drakx-d75bd538928cccfc63e0ea0a7d69c647312c5225.zip
move is cloop stuff
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/config-stage1.h1
-rw-r--r--mdk-stage1/stage1.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index ab30b58ae..c4b065bd3 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -40,6 +40,7 @@
#else
#define DISTRIB_NAME "Mandrake Linux"
#define IMAGE_LOCATION "/tmp/image"
+#define IMAGE_LOCATION_REAL "/tmp/image"
#endif
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index f97aa472d..e85802995 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -394,7 +394,7 @@ int mandrake_move_post(void)
int fd;
char rootdev[] = "0x0100";
- if (scall(!(f = fopen(IMAGE_LOCATION "/move/symlinks", "rb")), "fopen"))
+ if (scall(!(f = fopen(IMAGE_LOCATION_REAL "/move/symlinks", "rb")), "fopen"))
return RETURN_ERROR;
while (fgets(buf, sizeof(buf), f)) {
char oldpath[500], newpath[500];
@@ -411,7 +411,7 @@ int mandrake_move_post(void)
// we need only the ones before mounting /dev as devfs
if (scall(mkdir(SLASH_LOCATION "/dev", 0755), "mkdir"))
return RETURN_ERROR;
- if (scall(!(f = fopen(IMAGE_LOCATION "/move/devices", "rb")), "fopen"))
+ if (scall(!(f = fopen(IMAGE_LOCATION_REAL "/move/devices", "rb")), "fopen"))
return RETURN_ERROR;
while (fgets(buf, sizeof(buf), f)) {
char name[500], path[500], type;
@@ -501,8 +501,8 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
method_select_and_prepare();
if (!IS_RAMDISK)
- if (symlink(IMAGE_LOCATION LIVE_LOCATION, STAGE2_LOCATION) != 0)
- log_perror("symlink from " IMAGE_LOCATION LIVE_LOCATION " to " STAGE2_LOCATION " failed");
+ if (symlink(IMAGE_LOCATION_REAL LIVE_LOCATION, STAGE2_LOCATION) != 0)
+ log_perror("symlink from " IMAGE_LOCATION_REAL LIVE_LOCATION " to " STAGE2_LOCATION " failed");
if (interactive_pid != 0)
kill(interactive_pid, 9);