89b86368f8
Update sos in rawhide to the upstream 3.2 release and additional patches including the fix for CVE-2015-7529.
26 lines
940 B
Diff
26 lines
940 B
Diff
From b3faad3f82ee1f735e2221bb2f39b8b8aeaf0e86 Mon Sep 17 00:00:00 2001
|
|
From: "Bryn M. Reeves" <bmr@redhat.com>
|
|
Date: Mon, 3 Aug 2015 16:39:53 +0100
|
|
Subject: [PATCH] [logs] fix reference to missing 'rsyslog_conf' variable
|
|
|
|
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
---
|
|
sos/plugins/logs.py | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
|
|
index 7957898..70ef537 100644
|
|
--- a/sos/plugins/logs.py
|
|
+++ b/sos/plugins/logs.py
|
|
@@ -42,6 +42,7 @@ class Logs(Plugin):
|
|
logs = self.do_regex_find_all("^\S+\s+(-?\/.*$)\s+", syslog_conf)
|
|
if self.is_installed("rsyslog") \
|
|
or os.path.exists("/etc/rsyslog.conf"):
|
|
+ rsyslog_conf = self.join_sysroot("/etc/rsyslog.conf")
|
|
logs += self.do_regex_find_all("^\S+\s+(-?\/.*$)\s+",
|
|
rsyslog_conf)
|
|
for i in logs:
|
|
--
|
|
1.8.3.1
|
|
|