|
 |
bffc8a |
From 019f7c49768f27ef15f39d80db8a03b2aaa453ee Mon Sep 17 00:00:00 2001
|
|
|
bffc8a |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
bffc8a |
Date: Mon, 21 Sep 2020 17:33:25 +0200
|
|
|
bffc8a |
Subject: [PATCH] [crio] collect /etc/crio/crio.conf.d/
|
|
|
bffc8a |
|
|
|
bffc8a |
Crio configs can be newly in the dir also.
|
|
|
bffc8a |
|
|
|
bffc8a |
Resolves: #2240
|
|
|
bffc8a |
|
|
|
bffc8a |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
bffc8a |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
bffc8a |
---
|
|
|
bffc8a |
sos/report/plugins/crio.py | 1 +
|
|
|
bffc8a |
1 file changed, 1 insertion(+)
|
|
|
bffc8a |
|
|
|
bffc8a |
diff --git a/sos/report/plugins/crio.py b/sos/report/plugins/crio.py
|
|
|
bffc8a |
index dacc0745..e8b566c3 100644
|
|
|
bffc8a |
--- a/sos/report/plugins/crio.py
|
|
|
bffc8a |
+++ b/sos/report/plugins/crio.py
|
|
|
bffc8a |
@@ -31,6 +31,7 @@ class CRIO(Plugin, RedHatPlugin, UbuntuPlugin):
|
|
|
bffc8a |
"/etc/crictl.yaml",
|
|
|
bffc8a |
"/etc/crio/crio.conf",
|
|
|
bffc8a |
"/etc/crio/seccomp.json",
|
|
|
bffc8a |
+ "/etc/crio/crio.conf.d/",
|
|
|
bffc8a |
"/etc/systemd/system/cri-o.service",
|
|
|
bffc8a |
"/etc/sysconfig/crio-*"
|
|
|
bffc8a |
])
|
|
|
bffc8a |
--
|
|
|
bffc8a |
2.26.2
|
|
|
bffc8a |
|
|
|
bffc8a |
From 7f72a36144b3e235159556689b5129b7453294e3 Mon Sep 17 00:00:00 2001
|
|
|
bffc8a |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
bffc8a |
Date: Tue, 15 Dec 2020 14:19:34 +0100
|
|
|
bffc8a |
Subject: [PATCH] [component] Use sysroot from Policy when opts doesn't specify
|
|
|
bffc8a |
it
|
|
|
bffc8a |
|
|
|
bffc8a |
Until --sysroot option is specified, Archive (sub)classes should
|
|
|
bffc8a |
be called with sysroot determined from Policy.
|
|
|
bffc8a |
|
|
|
bffc8a |
Resolves: #2346
|
|
|
bffc8a |
|
|
|
bffc8a |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
bffc8a |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
bffc8a |
---
|
|
|
bffc8a |
sos/component.py | 4 ++--
|
|
|
bffc8a |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
bffc8a |
|
|
|
bffc8a |
diff --git a/sos/component.py b/sos/component.py
|
|
|
bffc8a |
index 69d3b755..7774c05a 100644
|
|
|
bffc8a |
--- a/sos/component.py
|
|
|
bffc8a |
+++ b/sos/component.py
|
|
|
bffc8a |
@@ -246,13 +246,13 @@ class SoSComponent():
|
|
|
bffc8a |
auto_archive = self.policy.get_preferred_archive()
|
|
|
bffc8a |
self.archive = auto_archive(archive_name, self.tmpdir,
|
|
|
bffc8a |
self.policy, self.opts.threads,
|
|
|
bffc8a |
- enc_opts, self.opts.sysroot,
|
|
|
bffc8a |
+ enc_opts, self.sysroot,
|
|
|
bffc8a |
self.manifest)
|
|
|
bffc8a |
|
|
|
bffc8a |
else:
|
|
|
bffc8a |
self.archive = TarFileArchive(archive_name, self.tmpdir,
|
|
|
bffc8a |
self.policy, self.opts.threads,
|
|
|
bffc8a |
- enc_opts, self.opts.sysroot,
|
|
|
bffc8a |
+ enc_opts, self.sysroot,
|
|
|
bffc8a |
self.manifest)
|
|
|
bffc8a |
|
|
|
bffc8a |
self.archive.set_debug(True if self.opts.debug else False)
|
|
|
bffc8a |
--
|
|
|
bffc8a |
2.26.2
|
|
|
bffc8a |
|