diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 12:42:13 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-04 12:42:13 +0000 |
| commit | f990efc31615da523ba99809dc1c771b8555d3a1 (patch) | |
| tree | a461d3f42024a2dc5e1ec753940b975a2e296e25 | |
| parent | bb8b29ddc15c9cc3c200b0a4d1b51042663e12f4 (diff) | |
| download | drakx-backup-do-not-use-f990efc31615da523ba99809dc1c771b8555d3a1.tar drakx-backup-do-not-use-f990efc31615da523ba99809dc1c771b8555d3a1.tar.gz drakx-backup-do-not-use-f990efc31615da523ba99809dc1c771b8555d3a1.tar.bz2 drakx-backup-do-not-use-f990efc31615da523ba99809dc1c771b8555d3a1.tar.xz drakx-backup-do-not-use-f990efc31615da523ba99809dc1c771b8555d3a1.zip | |
simplify since STAGE2_LOCATION is now valid for live installs before pivot_root
(due to previous stage1.c commit)
| -rw-r--r-- | mdk-stage1/stage1.c | 7 |
1 files 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 |