xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2025-01-05 19:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Moved DOWNLOAD_PROTO_XXX options to config.h

Browse Source
This commit is contained in:
Michael Brown 2005-05-02 11:13:47 +00:00
parent f9f1d2c84c
commit cc980d1c94
3 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Config
View File

@ -194,22 +194,6 @@
# Support for sending multicast packets
# -DMULTICAST_LEVEL2
# Support for receiving multicast packets
# -DDNS_RESOLVER
# Support for resolving hostnames in bootfile name (experimental)
# -DDOWNLOAD_PROTO_TFTP
# If defined, includes TFTP support (recommended).
# -DDOWNLOAD_PROTO_NFS
# If defined, includes NFS support.
# -DDEFAULT_PROTO_NFS
# If defined, makes NFS the default protocol instead
# of TFTP. Requires DOWNLOAD_PROTO_NFS.
# -DDOWNLOAD_PROTO_SLAM
# If defined, includes Scalable Local Area Multicast
# support.
# -DDOWNLOAD_PROTO_TFTM
# If defined, includes TFTP Multicast mode support.
# -DDOWNLOAD_PROTO_HTTP
# If defined, includes HTTP support.
#
# Interface export options:
#
@ -348,19 +332,8 @@ CFLAGS+= -DTAGGED_IMAGE -DELF_IMAGE
# CFLAGS+= -DCOFF_IMAGE
# CFLAGS+= -DRAW_IMAGE
# Download files via TFTP
CFLAGS+= -DDOWNLOAD_PROTO_TFTP
# Change download protocol to NFS, default is TFTP
# CFLAGS+= -DDOWNLOAD_PROTO_NFS
# Change download protocol to HTTP, default is TFTP
# CFLAGS+= -DDOWNLOAD_PROTO_HTTP
# Change default protocol to NFS
# CFLAGS+= -DDEFAULT_PROTO_NFS
# Support to resolve hostnames in boot filename
# CFLAGS+= -DDNS_RESOLVER
# Multicast Support
# CFLAGS+= -DALLMULTI -DMULTICAST_LEVEL1 -DMULTICAST_LEVEL2 -DDOWNLOAD_PROTO_TFTM
# CFLAGS+= -DALLMULTI -DMULTICAST_LEVEL1 -DMULTICAST_LEVEL2
# Etherboot as a PXE network protocol ROM
CFLAGS+= -DPXE_IMAGE -DPXE_EXPORT

20
src/core/config.c
View File

@ -170,6 +170,26 @@ REQUIRE_OBJECT ( pc_kbd );
REQUIRE_OBJECT ( relocate );
#endif
/*
* Drag in all requested protocols
*
*/
#ifdef DOWNLOAD_PROTO_TFTP
REQUIRE_OBJECT ( tftp );
#endif
#ifdef DOWNLOAD_PROTO_NFS
REQUIRE_OBJECT ( nfs );
#endif
#ifdef DOWNLOAD_PROTO_HTTP
REQUIRE_OBJECT ( http );
#endif
#ifdef DOWNLOAD_PROTO_TFTM
REQUIRE_OBJECT ( tftm );
#endif
#ifdef DOWNLOAD_PROTO_SLAM
REQUIRE_OBJECT ( slam );
#endif
/*
* Drag in any required resolvers
*

4
src/include/etherboot.h
View File

@ -49,10 +49,6 @@
#define DEFAULT_BOOTFILE PXENFSROOTPATH "/boot/pxeboot"
#endif
#if !defined(DOWNLOAD_PROTO_TFTP) && !defined(DOWNLOAD_PROTO_NFS) && !defined(DOWNLOAD_PROTO_SLAM) && !defined(DOWNLOAD_PROTO_TFTM) && !defined(DOWNLOAD_PROTO_DISK) && !defined(DOWNLOAD_PROTO_HTTP)
#error No download protocol defined!
#endif
#ifndef MAX_TFTP_RETRIES
#define MAX_TFTP_RETRIES 20
#endif