diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-06-01 18:58:31 +0100 |
|---|---|---|
| committer | Andy Whitcroft <apw@canonical.com> | 2012-06-01 19:01:17 +0100 |
| commit | a857c4859adc5f5d258f46a0e424d4ff2225a79b (patch) | |
| tree | 96f9e111da1b6a2e807d6fd21b9a4ee0f238b791 | |
| parent | 492b68c3acc31f2473ae3f0c041bb57aac74b50d (diff) | |
UBUNTU: [Config] CONFIG_AUDIT_LOGINUID_IMMUTABLE incompatible with upstart
Signed-off-by: Andy Whitcroft <apw@canonical.com>
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 2 | ||||
| -rw-r--r-- | debian.master/config/enforce | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 20359433329..0bac9610df1 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -464,7 +464,7 @@ CONFIG_ATP=m CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_GENERIC=y -CONFIG_AUDIT_LOGINUID_IMMUTABLE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set CONFIG_AUDIT_TREE=y CONFIG_AUDIT_WATCH=y CONFIG_AUFS_BDEV_LOOP=y diff --git a/debian.master/config/enforce b/debian.master/config/enforce index f0729fe1be7..b7c20673449 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -110,3 +110,6 @@ value CONFIG_EFI_VARS y | !exists CONFIG_EFI_VARS # support. (!exists CONFIG_BRCMSMAC | value CONFIG_BRCMSMAC n) | \ ((value CONFIG_BRCMSMAC y | value CONFIG_BRCMSMAC m) & (value CONFIG_B43_BCMA_EXTRA n | !exists CONFIG_B43_BCMA_EXTRA)) + +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not compatible with upstart +value CONFIG_AUDIT_LOGINUID_IMMUTABLE n |