From f990efc31615da523ba99809dc1c771b8555d3a1 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 4 Nov 2004 12:42:13 +0000 Subject: simplify since STAGE2_LOCATION is now valid for live installs before pivot_root (due to previous stage1.c commit) --- mdk-stage1/stage1.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 7d8234f1e..6c47a644b 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -563,11 +563,8 @@ void finish_preparing(void) #else 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_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)) + if (create_initial_fs(STAGE2_LOCATION "/usr/share/symlinks", + STAGE2_LOCATION "/usr/share/devices") != RETURN_OK) stg1_fatal_message("Fatal error finishing initialization."); #endif -- cgit v1.2.1