diff --git a/SOURCES/sos-bz1992957-conversions-and-upgrades.patch b/SOURCES/sos-bz1992957-conversions-and-upgrades.patch new file mode 100644 index 0000000..a39f839 --- /dev/null +++ b/SOURCES/sos-bz1992957-conversions-and-upgrades.patch @@ -0,0 +1,50 @@ +From ee5d9d017b0a1bfeaebee9c21c17e89ef1f909a8 Mon Sep 17 00:00:00 2001 +From: Pavel Moravec +Date: Mon, 26 Jul 2021 13:30:09 +0200 +Subject: [PATCH] [MigrationResults] collect info about conversions and + upgrades + +A new tiny plugin independent on leapp and convert2rhel is proposed. + +It should collect /etc/migration-results with info about RHEL +conversions and upgrades, whenever the file is present. + +Resolves: #2627 +Relevant to: rhbz#1959598 + +Signed-off-by: Pavel Moravec +--- + sos/report/plugins/migration_results.py | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + create mode 100644 sos/report/plugins/migration_results.py + +diff --git a/sos/report/plugins/migration_results.py b/sos/report/plugins/migration_results.py +new file mode 100644 +index 00000000..b67480ba +--- /dev/null ++++ b/sos/report/plugins/migration_results.py +@@ -0,0 +1,21 @@ ++# This file is part of the sos project: https://github.com/sosreport/sos ++# ++# This copyrighted material is made available to anyone wishing to use, ++# modify, copy, or redistribute it subject to the terms and conditions of ++# version 2 of the GNU General Public License. ++# ++# See the LICENSE file in the source distribution for further information. ++ ++from sos.report.plugins import Plugin, RedHatPlugin ++ ++ ++class MigrationResults(Plugin, RedHatPlugin): ++ ++ short_desc = 'Information about conversions and upgrades' ++ ++ plugin_name = 'migration_results' ++ profiles = ('system',) ++ ++ files = ('/etc/migration-results',) ++ ++# vim: et ts=4 sw=4 +-- +2.31.1 + diff --git a/SPECS/sos.spec b/SPECS/sos.spec index 831a5e3..cb596ae 100644 --- a/SPECS/sos.spec +++ b/SPECS/sos.spec @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 4.0 -Release: 11%{?dist} +Release: 12%{?dist} Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz Source1: sos-audit-%{auditversion}.tgz @@ -42,6 +42,7 @@ Patch19: sos-bz1887402-kexec-logs.patch Patch20: sos-bz1916729-ftp-upload-no-passwd.patch Patch21: sos-bz1925419-gluster-pubkeys-statusfile.patch Patch22: sos-bz1928650-powerpc-nhv-scsi-logs.patch +Patch23: sos-bz1992957-conversions-and-upgrades.patch %description @@ -75,6 +76,7 @@ support technicians and developers. %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 %build %py3_build @@ -137,6 +139,10 @@ of the system. Currently storage and filesystem commands are audited. %ghost /etc/audit/rules.d/40-sos-storage.rules %changelog +* Thu Aug 12 2021 Pavel Moravec = 4.0-12 +- [MigrationResults] collect info about conversions+upgrades + Resolves: bz1992957 + * Wed Mar 17 2021 Pavel Moravec = 4.0-11 - [gluster] collect public keys from the right dir Resolves: bz1925419