diff options
| author | Nicolas Planel <nplanel@mandriva.com> | 2003-10-29 16:07:11 +0000 |
|---|---|---|
| committer | Nicolas Planel <nplanel@mandriva.com> | 2003-10-29 16:07:11 +0000 |
| commit | de47eb59bb829423b1d0f47ba13099073999b3cb (patch) | |
| tree | 827f35c4666e15ec66edae7c1fa05d963324602b /mdk-stage1/stage1.c | |
| parent | 1fece42e9c460ca017fc4facad380f05163d8977 (diff) | |
| download | drakx-backup-do-not-use-topic/Corpo_2_1.tar drakx-backup-do-not-use-topic/Corpo_2_1.tar.gz drakx-backup-do-not-use-topic/Corpo_2_1.tar.bz2 drakx-backup-do-not-use-topic/Corpo_2_1.tar.xz drakx-backup-do-not-use-topic/Corpo_2_1.zip | |
Corporate Server 2.1.1 releasetopic/Corpo_2_1
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 44ed25155..bc3b457e3 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -403,7 +403,8 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) update_modules(); #ifdef ENABLE_PCMCIA - handle_pcmcia(&pcmcia_adapter); + if (!IS_NOAUTO) + handle_pcmcia(&pcmcia_adapter); #endif if (IS_CHANGEDISK) @@ -417,7 +418,12 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) "your own risk. Alternatively, you may reboot your system now."); } - ret = method_select_and_prepare(); +#ifndef DISABLE_DISK + if (IS_RECOVERY && streq(get_auto_value("method"), "cdrom") && process_recovery()) + ret = RETURN_OK; + else +#endif + ret = method_select_and_prepare(); finish_frontend(); close_log(); |