diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2002-07-03 18:38:05 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2002-07-03 18:38:05 +0000 |
| commit | 1cdb4f411c123a1f7402c9efbe46b3b05c3d94a1 (patch) | |
| tree | 54c7b6b4bbaf2e493e773f9e48d7eb459f60f197 /mdk-stage1/stage1.c | |
| parent | a3fd355593f7ab9ae5c6d57ec69ef3f5a2f8cb9a (diff) | |
| download | drakx-1cdb4f411c123a1f7402c9efbe46b3b05c3d94a1.tar drakx-1cdb4f411c123a1f7402c9efbe46b3b05c3d94a1.tar.gz drakx-1cdb4f411c123a1f7402c9efbe46b3b05c3d94a1.tar.bz2 drakx-1cdb4f411c123a1f7402c9efbe46b3b05c3d94a1.tar.xz drakx-1cdb4f411c123a1f7402c9efbe46b3b05c3d94a1.zip | |
compile with -W
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 2c58a19a6..b70cf33a3 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -266,9 +266,9 @@ static void expert_third_party_modules(void) } +#ifdef ENABLE_PCMCIA static void handle_pcmcia(char ** pcmcia_adapter) { -#ifdef ENABLE_PCMCIA char buf[50]; int fd = open("/proc/version", O_RDONLY); int size; @@ -299,8 +299,8 @@ static void handle_pcmcia(char ** pcmcia_adapter) if (IS_EXPERT) expert_third_party_modules(); -#endif } +#endif /************************************************************ @@ -374,12 +374,14 @@ static enum return_type method_select_and_prepare(void) } -int main(int argc, char **argv, char **env) +int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)), char **env) { enum return_type ret; char ** argptr; char * stage2_args[30]; +#ifdef ENABLE_PCMCIA char * pcmcia_adapter = NULL; +#endif if (getpid() > 50) set_param(MODE_TESTING); @@ -400,7 +402,9 @@ int main(int argc, char **argv, char **env) if (IS_UPDATEMODULES) update_modules(); +#ifdef ENABLE_PCMCIA handle_pcmcia(&pcmcia_adapter); +#endif if (IS_CHANGEDISK) stg1_info_message("You are starting the installation with an alternate booting method. " @@ -440,10 +444,12 @@ int main(int argc, char **argv, char **env) *argptr++ = "/usr/bin/runinstall2"; *argptr++ = "--method"; *argptr++ = method_name; +#ifdef ENABLE_PCMCIA if (pcmcia_adapter) { *argptr++ = "--pcmcia"; *argptr++ = pcmcia_adapter; } +#endif if (disable_modules) *argptr++ = "--blank"; if (stage2_kickstart) { |