|
 |
b72d26 |
From dfed1abf3cac691cfc669bbf4e07e58e2e637776 Mon Sep 17 00:00:00 2001
|
|
|
b72d26 |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
b72d26 |
Date: Fri, 27 Jul 2018 08:27:45 +0200
|
|
|
b72d26 |
Subject: [PATCH] [apparmor,ceph] fix typo in add_forbidden_path
|
|
|
b72d26 |
|
|
|
b72d26 |
commit 29a40b7 removed leading '/' from two forbidden paths
|
|
|
b72d26 |
|
|
|
b72d26 |
Resolves: #1388
|
|
|
b72d26 |
|
|
|
b72d26 |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
b72d26 |
---
|
|
|
b72d26 |
sos/plugins/apparmor.py | 2 +-
|
|
|
b72d26 |
sos/plugins/ceph.py | 2 +-
|
|
|
b72d26 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
b72d26 |
|
|
|
b72d26 |
diff --git a/sos/plugins/apparmor.py b/sos/plugins/apparmor.py
|
|
|
b72d26 |
index c4c64baf..e239c0b5 100644
|
|
|
b72d26 |
--- a/sos/plugins/apparmor.py
|
|
|
b72d26 |
+++ b/sos/plugins/apparmor.py
|
|
|
b72d26 |
@@ -26,7 +26,7 @@ class Apparmor(Plugin, UbuntuPlugin):
|
|
|
b72d26 |
self.add_forbidden_path([
|
|
|
b72d26 |
"/etc/apparmor.d/cache",
|
|
|
b72d26 |
"/etc/apparmor.d/libvirt/libvirt*",
|
|
|
b72d26 |
- "etc/apparmor.d/abstractions"
|
|
|
b72d26 |
+ "/etc/apparmor.d/abstractions"
|
|
|
b72d26 |
])
|
|
|
b72d26 |
|
|
|
b72d26 |
self.add_cmd_output([
|
|
|
b72d26 |
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
|
|
|
b72d26 |
index 10e48b62..ed6816b2 100644
|
|
|
b72d26 |
--- a/sos/plugins/ceph.py
|
|
|
b72d26 |
+++ b/sos/plugins/ceph.py
|
|
|
b72d26 |
@@ -77,7 +77,7 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
|
|
|
b72d26 |
"/var/lib/ceph/mon/*",
|
|
|
b72d26 |
# Excludes temporary ceph-osd mount location like
|
|
|
b72d26 |
# /var/lib/ceph/tmp/mnt.XXXX from sos collection.
|
|
|
b72d26 |
- "var/lib/ceph/tmp/*mnt*",
|
|
|
b72d26 |
+ "/var/lib/ceph/tmp/*mnt*",
|
|
|
b72d26 |
"/etc/ceph/*bindpass*"
|
|
|
b72d26 |
])
|
|
|
b72d26 |
|
|
|
b72d26 |
--
|
|
|
b72d26 |
2.17.1
|
|
|
b72d26 |
|