diff options
author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2012-04-09 10:28:17 -0700 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 15:04:07 -0600 |
commit | dad23922d3d85e2d8c1ed8e72c49424eaa0cfeb8 (patch) | |
tree | 5292cd2cc459c47b9c8d3fb10bb1ddae638355de /security/apparmor/apparmorfs.c | |
parent | 5a7ce65534eb42cf64526abbc9ff5eab2ca3a0f9 (diff) |
Revert Temporarily "UBUNTU: SAUCE: AppArmor: basic networking rules"
Temporarily reverts commit 81e0e2103035c9fc806757ddfa859e66c1b23c32.
Repeated Oops/Panic on boot. Needs re-work after v3.4-rc2 rebase.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'security/apparmor/apparmorfs.c')
-rw-r--r-- | security/apparmor/apparmorfs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 01a335d15c2..fbedacb942e 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -438,7 +438,6 @@ static struct aa_fs_entry aa_fs_entry_namespaces[] = { static struct aa_fs_entry aa_fs_entry_features[] = { AA_FS_DIR("domain", aa_fs_entry_domain), AA_FS_DIR("file", aa_fs_entry_file), - AA_FS_DIR("network", aa_fs_entry_network), AA_FS_DIR("mount", aa_fs_entry_mount), AA_FS_DIR("namespaces", aa_fs_entry_namespaces), AA_FS_FILE_U64("capability", VFS_CAP_FLAGS_MASK), |