diff options
| author | John Johansen <john.johansen@canonical.com> | 2010-07-29 14:48:09 -0700 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-08-02 15:35:15 +1000 |
| commit | c1c124e91e7c6d5a600c98f6fb5b443c403a14f4 (patch) | |
| tree | 58a4cf515dbd4fc4ea9e132fb2c5427d87408e3d /Documentation/kernel-parameters.txt | |
| parent | 898127c34ec03291c86f4ff3856d79e9e18952bc (diff) | |
| download | linux-stable-c1c124e91e7c6d5a600c98f6fb5b443c403a14f4.tar.gz linux-stable-c1c124e91e7c6d5a600c98f6fb5b443c403a14f4.tar.bz2 linux-stable-c1c124e91e7c6d5a600c98f6fb5b443c403a14f4.zip | |
AppArmor: update Maintainer and Documentation
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 2b2407d9a6d0..b61f89fa01c1 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -93,6 +93,7 @@ parameter is applicable: Documentation/scsi/. SECURITY Different security models are enabled. SELINUX SELinux support is enabled. + APPARMOR AppArmor support is enabled. SERIAL Serial support is enabled. SH SuperH architecture is enabled. SMP The kernel is an SMP kernel. @@ -2312,6 +2313,13 @@ and is between 256 and 4096 characters. It is defined in the file If enabled at boot time, /selinux/disable can be used later to disable prior to initial policy load. + apparmor= [APPARMOR] Disable or enable AppArmor at boot time + Format: { "0" | "1" } + See security/apparmor/Kconfig help text + 0 -- disable. + 1 -- enable. + Default value is set via kernel config option. + serialnumber [BUGS=X86-32] shapers= [NET] |