From 019f7c49768f27ef15f39d80db8a03b2aaa453ee Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Mon, 21 Sep 2020 17:33:25 +0200
Subject: [PATCH] [crio] collect /etc/crio/crio.conf.d/

Crio configs can be newly in the dir also.

Resolves: #2240

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/report/plugins/crio.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sos/report/plugins/crio.py b/sos/report/plugins/crio.py
index dacc0745..e8b566c3 100644
--- a/sos/report/plugins/crio.py
+++ b/sos/report/plugins/crio.py
@@ -31,6 +31,7 @@ class CRIO(Plugin, RedHatPlugin, UbuntuPlugin):
             "/etc/crictl.yaml",
             "/etc/crio/crio.conf",
             "/etc/crio/seccomp.json",
+            "/etc/crio/crio.conf.d/",
             "/etc/systemd/system/cri-o.service",
             "/etc/sysconfig/crio-*"
         ])
-- 
2.26.2

From 7f72a36144b3e235159556689b5129b7453294e3 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Tue, 15 Dec 2020 14:19:34 +0100
Subject: [PATCH] [component] Use sysroot from Policy when opts doesn't specify
 it

Until --sysroot option is specified, Archive (sub)classes should
be called with sysroot determined from Policy.

Resolves: #2346

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/component.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sos/component.py b/sos/component.py
index 69d3b755..7774c05a 100644
--- a/sos/component.py
+++ b/sos/component.py
@@ -246,13 +246,13 @@ class SoSComponent():
             auto_archive = self.policy.get_preferred_archive()
             self.archive = auto_archive(archive_name, self.tmpdir,
                                         self.policy, self.opts.threads,
-                                        enc_opts, self.opts.sysroot,
+                                        enc_opts, self.sysroot,
                                         self.manifest)
 
         else:
             self.archive = TarFileArchive(archive_name, self.tmpdir,
                                           self.policy, self.opts.threads,
-                                          enc_opts, self.opts.sysroot,
+                                          enc_opts, self.sysroot,
                                           self.manifest)
 
         self.archive.set_debug(True if self.opts.debug else False)
-- 
2.26.2