X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab-2.6.22-i686.config;h=81ee215e65302f4dbee5c9770fa37c7f85debb83;hb=a0eb79b042b1aaeed5db6ede1821598afeb4aaf8;hp=14e6d9fe3bf62c71dd8920f431145e4f2686c69e;hpb=8d6c94a42c83f0f0ef5542c30b84f73cd782c637;p=linux-2.6.git

diff --git a/planetlab-2.6.22-i686.config b/planetlab-2.6.22-i686.config
index 14e6d9fe3..81ee215e6 100644
--- a/planetlab-2.6.22-i686.config
+++ b/planetlab-2.6.22-i686.config
@@ -412,6 +412,13 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
+CONFIG_WEB100=y
+CONFIG_WEB100_STATS=y
+CONFIG_WEB100_FPERMS=416
+CONFIG_WEB100_GID=0
+CONFIG_WEB100_UID=0
+CONFIG_WEB100_NET100=y
+CONFIG_WEB100_NETLINK=y
 # CONFIG_IP_VS is not set
 CONFIG_ICMP_IPOD=y
 CONFIG_IPV6=y
@@ -1468,7 +1475,7 @@ CONFIG_NSC_GPIO=m
 CONFIG_CS5535_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
-CONFIG_HANGCHECK_TIMER=m
+CONFIG_HANGCHECK_TIMER=y
 
 #
 # TPM devices
@@ -1686,7 +1693,44 @@ CONFIG_USB_STORAGE_KARMA=y
 #
 # USB Serial Converter support
 #
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_PL2303=m
 
 #
 # USB Miscellaneous drivers
@@ -1862,7 +1906,7 @@ CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
 CONFIG_GENERIC_ACL=y
 
 #
@@ -2071,6 +2115,11 @@ CONFIG_4KSTACKS=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y
+CONFIG_KDB=y
+CONFIG_KDB_MODULES=m
+CONFIG_KDB_OFF=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_KDB_USB=y
 
 #
 # Linux VServer
@@ -2078,7 +2127,7 @@ CONFIG_DOUBLEFAULT=y
 CONFIG_VSERVER_FILESHARING=y
 # CONFIG_VSERVER_AUTO_LBACK is not set
 # CONFIG_VSERVER_AUTO_SINGLE is not set
-# CONFIG_VSERVER_COWBL is not set
+CONFIG_VSERVER_COWBL=y
 # CONFIG_VSERVER_VTIME is not set
 # CONFIG_VSERVER_DEVICE is not set
 # CONFIG_VSERVER_PROC_SECURE is not set
@@ -2092,7 +2141,7 @@ CONFIG_TAGGING_ID24=y
 # CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
 # CONFIG_VSERVER_PRIVACY is not set
-CONFIG_VSERVER_CONTEXTS=256
+CONFIG_VSERVER_CONTEXTS=512
 CONFIG_VSERVER_WARN=y
 # CONFIG_VSERVER_DEBUG is not set
 CONFIG_VSERVER=y