summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-06-12 13:10:12 +0000
committerOlivier Blin <oblin@mandriva.com>2008-06-12 13:10:12 +0000
commit8d5fca6447e84f0543052ed1c51b6d4a1fda2d81 (patch)
tree1c459eb992645d2d17b45268d14bf85dce29a751
parent9d8c9e46ecf18e5020ef78c17e47ac1db7000ff9 (diff)
downloaddrakx-8d5fca6447e84f0543052ed1c51b6d4a1fda2d81.tar
drakx-8d5fca6447e84f0543052ed1c51b6d4a1fda2d81.tar.gz
drakx-8d5fca6447e84f0543052ed1c51b6d4a1fda2d81.tar.bz2
drakx-8d5fca6447e84f0543052ed1c51b6d4a1fda2d81.tar.xz
drakx-8d5fca6447e84f0543052ed1c51b6d4a1fda2d81.zip
do not define unused functions in network standalone mode
-rw-r--r--mdk-stage1/modules.c2
-rw-r--r--mdk-stage1/stage1.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 18642cdb9..53bc87d4c 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -296,6 +296,7 @@ int module_already_present(const char * name)
}
+#ifndef ENABLE_NETWORK_STANDALONE
static enum insmod_return insmod_with_deps(const char * mod_name, char * options, int allow_modules_floppy)
{
struct module_deps_elem * dep;
@@ -330,6 +331,7 @@ static enum insmod_return insmod_with_deps(const char * mod_name, char * options
return insmod_local_file((char *) filename, options);
}
}
+#endif
#ifndef DISABLE_NETWORK
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 85865ab0c..cdc207bfd 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -246,6 +246,7 @@ static void handle_pcmcia(void)
/************************************************************
*/
+#ifndef ENABLE_NETWORK_STANDALONE
static void method_select_and_prepare(void)
{
enum return_type results;
@@ -331,6 +332,7 @@ static void method_select_and_prepare(void)
/* try to find third party modules on the install media */
thirdparty_load_media_modules();
}
+#endif
static enum return_type create_initial_fs_symlinks(char* symlinks)
{