diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 12:16:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 12:16:19 +0000 |
| commit | 35b60523ce6b2e32f33dee7a09ce505cc5512be6 (patch) | |
| tree | a619197b382700f959fb25bf6407f3a58804f5f9 /mdk-stage1/stage1.c | |
| parent | f937ddc901c78571016f054ebc456e9716fbde73 (diff) | |
| download | drakx-35b60523ce6b2e32f33dee7a09ce505cc5512be6.tar drakx-35b60523ce6b2e32f33dee7a09ce505cc5512be6.tar.gz drakx-35b60523ce6b2e32f33dee7a09ce505cc5512be6.tar.bz2 drakx-35b60523ce6b2e32f33dee7a09ce505cc5512be6.tar.xz drakx-35b60523ce6b2e32f33dee7a09ce505cc5512be6.zip | |
LIVE_LOCATION is better named LIVE_LOCATION_REL without the leading "/"
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 03cd10515..efe50cddd 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -564,8 +564,8 @@ void finish_preparing(void) mkdir(SLASH_LOCATION "/etc", 0755); mkdir(SLASH_LOCATION "/var", 0755); /* STAGE2_LOCATION is wrong for live installs before pivot_root */ - if ((!IS_RAMDISK && create_initial_fs(IMAGE_LOCATION LIVE_LOCATION "/usr/share/symlinks", - IMAGE_LOCATION LIVE_LOCATION "/usr/share/devices") != RETURN_OK) + if ((!IS_RAMDISK && create_initial_fs(IMAGE_LOCATION "/" LIVE_LOCATION_REL "/usr/share/symlinks", + IMAGE_LOCATION "/" LIVE_LOCATION_REL "/usr/share/devices") != RETURN_OK) || (IS_RAMDISK && create_initial_fs(STAGE2_LOCATION "/usr/share/symlinks", STAGE2_LOCATION "/usr/share/devices") != RETURN_OK)) stg1_fatal_message("Fatal error finishing initialization."); @@ -662,8 +662,8 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) #ifndef MANDRAKE_MOVE if (!IS_RAMDISK) - if (symlink(IMAGE_LOCATION_REAL LIVE_LOCATION, STAGE2_LOCATION) != 0) - log_perror("symlink from " IMAGE_LOCATION_REAL LIVE_LOCATION " to " STAGE2_LOCATION " failed"); + if (symlink(IMAGE_LOCATION_REAL "/" LIVE_LOCATION_REL, STAGE2_LOCATION) != 0) + log_perror("symlink from " IMAGE_LOCATION_REAL "/" LIVE_LOCATION_REL " to " STAGE2_LOCATION " failed"); #endif if (interactive_pid != 0) |