diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-29 17:53:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-29 17:53:54 +0000 |
| commit | 38f7f8427f6300ccacb464a9d3b95e89d6f83ffc (patch) | |
| tree | 4bb5bf77bbe6128d4b458b30a277d655e6bf2e2b /mdk-stage1/stage1.c | |
| parent | 42a8773fe0e728410692098f2a11652ef5752849 (diff) | |
| download | drakx-backup-do-not-use-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar drakx-backup-do-not-use-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.gz drakx-backup-do-not-use-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.bz2 drakx-backup-do-not-use-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.xz drakx-backup-do-not-use-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.zip | |
- drop oem & recovery code (which was broken)
- will be replaced with a root password + user accounts + network configuration a la drakfirsttime
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index c25e3d68f..9768bce56 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -640,15 +640,8 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) if (total_memory() < MEM_LIMIT_MOVE) stg1_info_message(DISTRIB_NAME " typically needs more than %d Mbytes of memory (detected %d Mbytes). You may proceed, but the machine may crash or lock up for no apparent reason. Continue at your own risk. Alternatively, you may reboot your system now.", MEM_LIMIT_MOVE, total_memory()); -#else -#ifndef DISABLE_DISK - if (IS_RECOVERY && streq(get_auto_value("method"), "cdrom")) { - if (!process_recovery()) - method_select_and_prepare(); - } else -#endif #endif - method_select_and_prepare(); + method_select_and_prepare(); #ifndef MANDRAKE_MOVE if (access(STAGE2_LOCATION, R_OK) != 0) |