From db2c0a1d1cc989a89a16fa543fb93803e3d7949f Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 31 Jan 2011 10:50:10 -0500 Subject: [PATCH] -Change default config paramaters according to xCAT use scenario --- src/config/general.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/config/general.h b/src/config/general.h index 828f922b..1030c0b3 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -40,7 +40,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ #define NET_PROTO_IPV4 /* IPv4 protocol */ -#undef NET_PROTO_FCOE /* Fibre Channel over Ethernet protocol */ +#define NET_PROTO_FCOE /* Fibre Channel over Ethernet protocol */ /* * PXE support @@ -57,7 +57,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define DOWNLOAD_PROTO_TFTP /* Trivial File Transfer Protocol */ #define DOWNLOAD_PROTO_HTTP /* Hypertext Transfer Protocol */ #undef DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */ -#undef DOWNLOAD_PROTO_FTP /* File Transfer Protocol */ +#define DOWNLOAD_PROTO_FTP /* File Transfer Protocol */ #undef DOWNLOAD_PROTO_TFTM /* Multicast Trivial File Transfer Protocol */ #undef DOWNLOAD_PROTO_SLAM /* Scalable Local Area Multicast */ @@ -66,18 +66,18 @@ FILE_LICENCE ( GPL2_OR_LATER ); * */ -//#undef SANBOOT_PROTO_ISCSI /* iSCSI protocol */ -//#undef SANBOOT_PROTO_AOE /* AoE protocol */ -//#undef SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */ -//#undef SANBOOT_PROTO_FCP /* Fibre Channel protocol */ +#define SANBOOT_PROTO_ISCSI /* iSCSI protocol */ +#define SANBOOT_PROTO_AOE /* AoE protocol */ +#define SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */ +#define SANBOOT_PROTO_FCP /* Fibre Channel protocol */ /* * 802.11 cryptosystems and handshaking protocols * */ -#define CRYPTO_80211_WEP /* WEP encryption (deprecated and insecure!) */ -#define CRYPTO_80211_WPA /* WPA Personal, authenticating with passphrase */ -#define CRYPTO_80211_WPA2 /* Add support for stronger WPA cryptography */ +#undef CRYPTO_80211_WEP /* WEP encryption (deprecated and insecure!) */ +#undef CRYPTO_80211_WPA /* WPA Personal, authenticating with passphrase */ +#undef CRYPTO_80211_WPA2 /* Add support for stronger WPA cryptography */ /* * Name resolution modules @@ -99,9 +99,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); //#define IMAGE_MULTIBOOT /* MultiBoot image support */ //#define IMAGE_AOUT /* a.out image support */ //#define IMAGE_WINCE /* WinCE image support */ -//#define IMAGE_PXE /* PXE image support */ -//#define IMAGE_SCRIPT /* iPXE script image support */ -//#define IMAGE_BZIMAGE /* Linux bzImage image support */ +#define IMAGE_PXE /* PXE image support */ +#define IMAGE_SCRIPT /* iPXE script image support */ +#define IMAGE_BZIMAGE /* Linux bzImage image support */ //#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ //#define IMAGE_EFI /* EFI image support */ @@ -113,7 +113,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define NVO_CMD /* Non-volatile option storage commands */ #define CONFIG_CMD /* Option configuration console */ #define IFMGMT_CMD /* Interface management commands */ -#define IWMGMT_CMD /* Wireless interface management commands */ +#undef IWMGMT_CMD /* Wireless interface management commands */ #define FCMGMT_CMD /* Fibre Channel management commands */ #define ROUTE_CMD /* Routing table management commands */ #define IMAGE_CMD /* Image management commands */ @@ -125,7 +125,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #undef LOTEST_CMD /* Loopback testing commands */ #undef VLAN_CMD /* VLAN commands */ #undef PXE_CMD /* PXE commands */ -#undef REBOOT_CMD /* Reboot command */ +#define REBOOT_CMD /* Reboot command */ /* * Error message tables to include