- no to CKRM

- yes to autofs
- no to secure /proc
- yes to hard CPU limits

diff --git a/configs/kernel-2.6.6-i686-planetlab.config b/configs/kernel-2.6.6-i686-planetlab.config
index a546e52..be78e56 100644 (file)
--- a/configs/kernel-2.6.6-i686-planetlab.config
+++ b/configs/kernel-2.6.6-i686-planetlab.config
@@ -21,12 +21,18 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
+
+#
+# Class Based Kernel Resource Management
+#
+# CONFIG_CKRM is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_HOTPLUG is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_EMBEDDED is not set
+# CONFIG_DELAY_ACCT is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_FUTEX=y
@@ -447,6 +453,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
+# CONFIG_ACCEPT_QUEUES is not set
 
 #
 # IP: Virtual Server Configuration
@@ -933,8 +940,8 @@ CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
 
 #
 # CD-ROM/DVD Filesystems
@@ -966,6 +973,7 @@ CONFIG_TMPFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1070,8 +1078,8 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # Linux VServer
 #
 CONFIG_VSERVER_LEGACY=y
-CONFIG_PROC_SECURE=y
-# CONFIG_VSERVER_HARDCPU is not set
+# CONFIG_PROC_SECURE is not set
+CONFIG_VSERVER_HARDCPU=y
 # CONFIG_INOXID_NONE is not set
 # CONFIG_INOXID_GID16 is not set
 CONFIG_INOXID_GID24=y