]> git.proxmox.com Git - pve-kernel-3.10.0.git/blame - config-3.10.0.diff
disable CONFIG_DEFAULT_SECURITY_SELINUX
[pve-kernel-3.10.0.git] / config-3.10.0.diff
CommitLineData
e857e197 1--- rh-kernel-src/kernel-3.10.0-x86_64.config 2013-12-16 08:05:07.513206660 +0100
f396caf4 2+++ linux-2.6-3.10.0/.config 2013-12-17 12:51:02.505690103 +0100
688f31fc
DM
3@@ -1,7 +1,6 @@
4-# x86_64
5 #
6 # Automatically generated file; DO NOT EDIT.
7-# Linux/x86_64 3.10.0 Kernel Configuration
8+# Linux/x86 3.10.0-1-pve Kernel Configuration
9 #
10 CONFIG_64BIT=y
11 CONFIG_X86_64=y
12@@ -283,16 +282,7 @@
13 # CONFIG_MODULE_FORCE_UNLOAD is not set
14 CONFIG_MODVERSIONS=y
15 CONFIG_MODULE_SRCVERSION_ALL=y
16-CONFIG_MODULE_SIG=y
17-# CONFIG_MODULE_SIG_FORCE is not set
18-CONFIG_MODULE_SIG_ALL=y
19-CONFIG_MODULE_SIG_UEFI=y
20-# CONFIG_MODULE_SIG_SHA1 is not set
21-# CONFIG_MODULE_SIG_SHA224 is not set
22-CONFIG_MODULE_SIG_SHA256=y
23-# CONFIG_MODULE_SIG_SHA384 is not set
24-# CONFIG_MODULE_SIG_SHA512 is not set
25-CONFIG_MODULE_SIG_HASH="sha256"
26+# CONFIG_MODULE_SIG is not set
27 CONFIG_STOP_MACHINE=y
28 CONFIG_BLOCK=y
29 CONFIG_BLK_DEV_BSG=y
30@@ -1122,10 +1112,10 @@
31 CONFIG_L2TP_V3=y
32 CONFIG_L2TP_IP=m
33 CONFIG_L2TP_ETH=m
34-CONFIG_STP=m
35+CONFIG_STP=y
e857e197
DM
36 CONFIG_GARP=m
37 CONFIG_MRP=m
38-CONFIG_BRIDGE=m
39+CONFIG_BRIDGE=y
40 CONFIG_BRIDGE_IGMP_SNOOPING=y
41 CONFIG_BRIDGE_VLAN_FILTERING=y
42 CONFIG_HAVE_NET_DSA=y
688f31fc
DM
43@@ -1133,7 +1123,7 @@
44 CONFIG_VLAN_8021Q_GVRP=y
45 CONFIG_VLAN_8021Q_MVRP=y
46 # CONFIG_DECNET is not set
47-CONFIG_LLC=m
48+CONFIG_LLC=y
49 # CONFIG_LLC2 is not set
50 # CONFIG_IPX is not set
51 # CONFIG_ATALK is not set
52@@ -1431,7 +1421,8 @@
9ed71929
DM
53 CONFIG_BLK_DEV_LOOP=m
54 CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
55 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
56-# CONFIG_BLK_DEV_DRBD is not set
57+CONFIG_BLK_DEV_DRBD=m
58+# CONFIG_DRBD_FAULT_INJECTION is not set
59 # CONFIG_BLK_DEV_NBD is not set
60 CONFIG_BLK_DEV_NVME=m
61 CONFIG_BLK_DEV_OSD=m
688f31fc
DM
62@@ -1525,10 +1516,10 @@
63 #
64 # SCSI support type (disk, tape, CD-ROM)
65 #
66-CONFIG_BLK_DEV_SD=m
67+CONFIG_BLK_DEV_SD=y
68 CONFIG_CHR_DEV_ST=m
69 CONFIG_CHR_DEV_OSST=m
70-CONFIG_BLK_DEV_SR=m
71+CONFIG_BLK_DEV_SR=y
72 CONFIG_BLK_DEV_SR_VENDOR=y
73 CONFIG_CHR_DEV_SG=m
74 CONFIG_CHR_DEV_SCH=m
75@@ -1751,7 +1742,7 @@
76 # CONFIG_MD_MULTIPATH is not set
77 CONFIG_MD_FAULTY=m
78 # CONFIG_BCACHE is not set
79-CONFIG_BLK_DEV_DM=m
80+CONFIG_BLK_DEV_DM=y
81 CONFIG_DM_DEBUG=y
82 CONFIG_DM_BUFIO=m
83 CONFIG_DM_BIO_PRISON=m
84@@ -4529,7 +4520,11 @@
85 # CONFIG_JBD2_DEBUG is not set
86 CONFIG_FS_MBCACHE=m
87 # CONFIG_REISERFS_FS is not set
88-# CONFIG_JFS_FS is not set
89+CONFIG_JFS_FS=m
90+# CONFIG_JFS_POSIX_ACL is not set
91+# CONFIG_JFS_SECURITY is not set
92+# CONFIG_JFS_DEBUG is not set
93+# CONFIG_JFS_STATISTICS is not set
94 CONFIG_XFS_FS=m
95 CONFIG_XFS_QUOTA=y
96 CONFIG_XFS_POSIX_ACL=y
97@@ -4618,8 +4613,8 @@
98 # CONFIG_ADFS_FS is not set
99 # CONFIG_AFFS_FS is not set
100 # CONFIG_ECRYPT_FS is not set
101-# CONFIG_HFS_FS is not set
102-# CONFIG_HFSPLUS_FS is not set
103+CONFIG_HFS_FS=y
104+CONFIG_HFSPLUS_FS=y
105 # CONFIG_BEFS_FS is not set
106 # CONFIG_BFS_FS is not set
107 # CONFIG_EFS_FS is not set
108@@ -4754,7 +4749,7 @@
109 CONFIG_NLS_MAC_INUIT=m
110 CONFIG_NLS_MAC_ROMANIAN=m
111 CONFIG_NLS_MAC_TURKISH=m
112-CONFIG_NLS_UTF8=m
113+CONFIG_NLS_UTF8=y
114 CONFIG_DLM=m
115 CONFIG_DLM_DEBUG=y
116
f396caf4
DM
117@@ -4956,9 +4951,8 @@
118 CONFIG_INTEL_TXT=y
119 CONFIG_LSM_MMAP_MIN_ADDR=65535
120 CONFIG_SECURITY_SELINUX=y
121-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
122-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
123-CONFIG_SECURITY_SELINUX_DISABLE=y
124+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
125+# CONFIG_SECURITY_SELINUX_DISABLE is not set
126 CONFIG_SECURITY_SELINUX_DEVELOP=y
127 CONFIG_SECURITY_SELINUX_AVC_STATS=y
128 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
129@@ -4975,9 +4969,9 @@
130 CONFIG_IMA_AUDIT=y
131 CONFIG_IMA_LSM_RULES=y
132 # CONFIG_IMA_APPRAISE is not set
133-CONFIG_DEFAULT_SECURITY_SELINUX=y
134-# CONFIG_DEFAULT_SECURITY_DAC is not set
135-CONFIG_DEFAULT_SECURITY="selinux"
136+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
137+CONFIG_DEFAULT_SECURITY_DAC=y
138+CONFIG_DEFAULT_SECURITY=""
139 CONFIG_XOR_BLOCKS=m
140 CONFIG_ASYNC_CORE=m
141 CONFIG_ASYNC_MEMCPY=m
142@@ -5049,7 +5043,7 @@
688f31fc
DM
143 CONFIG_CRYPTO_CRC32C_INTEL=m
144 CONFIG_CRYPTO_CRC32=m
145 CONFIG_CRYPTO_CRC32_PCLMUL=m
146-CONFIG_CRYPTO_CRCT10DIF=m
147+CONFIG_CRYPTO_CRCT10DIF=y
148 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
149 CONFIG_CRYPTO_GHASH=m
150 CONFIG_CRYPTO_MD4=m
f396caf4 151@@ -5161,7 +5155,7 @@
688f31fc
DM
152 CONFIG_PERCPU_RWSEM=y
153 CONFIG_CRC_CCITT=m
154 CONFIG_CRC16=y
155-CONFIG_CRC_T10DIF=m
156+CONFIG_CRC_T10DIF=y
157 CONFIG_CRC_ITU_T=m
158 CONFIG_CRC32=y
159 # CONFIG_CRC32_SELFTEST is not set
f396caf4 160@@ -5208,6 +5202,7 @@
9ed71929
DM
161 CONFIG_DQL=y
162 CONFIG_NLATTR=y
163 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
164+CONFIG_LRU_CACHE=m
165 CONFIG_AVERAGE=y
166 CONFIG_CLZ_TAB=y
167 CONFIG_CORDIC=m