diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-02 13:45:26 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-02 13:45:26 +0000 |
| commit | a77fe688cd9c8c4efb8b9c363a7078e7a563f0bb (patch) | |
| tree | 1f9a0093f869e3517b4e1aa1669ee62533811d30 /mdk-stage1/stage1.c | |
| parent | 360de09d5fd6566f5e67b1ec785a6d938d07b5fb (diff) | |
| download | drakx-a77fe688cd9c8c4efb8b9c363a7078e7a563f0bb.tar drakx-a77fe688cd9c8c4efb8b9c363a7078e7a563f0bb.tar.gz drakx-a77fe688cd9c8c4efb8b9c363a7078e7a563f0bb.tar.bz2 drakx-a77fe688cd9c8c4efb8b9c363a7078e7a563f0bb.tar.xz drakx-a77fe688cd9c8c4efb8b9c363a7078e7a563f0bb.zip | |
compile less things when MANDRAKE_MOVE is defined
(needed so that future commits can restrict define's in config-stage1.h)
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 57477d198..03cd10515 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -363,13 +363,15 @@ static void method_select_and_prepare(void) #ifndef DISABLE_NETWORK if (!strcmp(choice, network_nfs_install)) results = nfs_prepare(); - + +#ifndef MANDRAKE_MOVE if (!strcmp(choice, network_ftp_install)) results = ftp_prepare(); if (!strcmp(choice, network_http_install)) results = http_prepare(); #endif +#endif if (results != RETURN_OK) return method_select_and_prepare(); @@ -648,19 +650,21 @@ 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()); -#endif - +#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(); +#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"); +#endif if (interactive_pid != 0) kill(interactive_pid, 9); |