aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrb44@plym.cl.cam.ac.uk <jrb44@plym.cl.cam.ac.uk>2005-09-28 14:21:29 +0100
committerjrb44@plym.cl.cam.ac.uk <jrb44@plym.cl.cam.ac.uk>2005-09-28 14:21:29 +0100
commit800749d2fa3244e4131fc41285c8fb8e012bddae (patch)
tree844e9cc62076a860dc5059765696b6bbe3704b46
parent460d77e2da8cb4dfc7209b98d35215f474d2ae32 (diff)
downloadxen-800749d2fa3244e4131fc41285c8fb8e012bddae.tar.gz
xen-800749d2fa3244e4131fc41285c8fb8e012bddae.tar.bz2
xen-800749d2fa3244e4131fc41285c8fb8e012bddae.zip
Changed -xen x86-32 defconfig CONFIG_SECURITY_CAPABILITIES=y
Was previously a module, which wasn't getting loaded and causing the LTP capset01 test to fail. Compiling in to the kernel brings this in to line with our own -xen x86-64 kernel and vendor kernels. Signed-off-by: James Bulpin <james@xensource.com>
-rw-r--r--linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_322
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
index 36898dcae0..a0f20e82b3 100644
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
@@ -2913,7 +2913,7 @@ CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
CONFIG_SECURITY=y
# CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
+CONFIG_SECURITY_CAPABILITIES=y
CONFIG_SECURITY_ROOTPLUG=m
CONFIG_SECURITY_SECLVL=m
CONFIG_SECURITY_SELINUX=y