Skip to content

Commit b4dbe0b

Browse files
jjansky1TurboTurtle
authored andcommitted
[tmpfiles] ignoring cleanup on /var/tmp/sos*
tmpfiles relocated to separated folder, added tmpfilesd-sos-rh.conf which ignoring tmpfiles clean on /var/tmp/sos*. This is introduced due to wrong selinux context on some collected files in temporal /var/tmp/sos or /var/tmp/sosreport which generate avc denials from tmpfiles or even repeated denials when --build option is used. Related: RHBZ#1664651 Resolves: sosreport#3180 Signed-off-by: Jan Jansky <[email protected]>
1 parent f3576ce commit b4dbe0b

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
('share/man/man5', ['man/en/sos.conf.5']),
2727
('share/licenses/sos', ['LICENSE']),
2828
('share/doc/sos', ['AUTHORS', 'README.md']),
29-
('config', ['sos.conf'])
29+
('config', ['sos.conf', 'tmpfiles/tmpfilesd-sos-rh.conf'])
3030
],
3131
packages=find_packages(include=['sos', 'sos.*'])
3232
)

sos.spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ install -d -m 700 ${RPM_BUILD_ROOT}/etc/sos/cleaner
3737
install -d -m 755 ${RPM_BUILD_ROOT}/etc/sos/presets.d
3838
install -d -m 755 ${RPM_BUILD_ROOT}/etc/sos/groups.d
3939
install -d -m 755 ${RPM_BUILD_ROOT}/etc/sos/extras.d
40+
install -d -m 755 ${RPM_BUILD_ROOT}/etc/tmpfiles.d/
4041
install -m 644 %{name}.conf ${RPM_BUILD_ROOT}/etc/sos/%{name}.conf
42+
install -m 644 tmpfiles/tmpfilesd-sos-rh.conf ${RPM_BUILD_ROOT}/etc/tmpfiles.d/%{name}.conf
4143

4244
rm -rf ${RPM_BUILD_ROOT}/usr/config/
4345

@@ -53,6 +55,7 @@ rm -rf ${RPM_BUILD_ROOT}/usr/config/
5355
%dir /etc/sos/presets.d
5456
%dir /etc/sos/extras.d
5557
%dir /etc/sos/groups.d
58+
/etc/tmpfiles.d/%{name}.conf
5659
%{python3_sitelib}/*
5760
%{_mandir}/man1/*
5861
%{_mandir}/man5/*

tmpfiles/tmpfilesd-sos-rh.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore the contents of extracted sosreport directories.
2+
#
3+
# Type Path Mode User Group Age Argument
4+
x /var/tmp/sos*
File renamed without changes.

0 commit comments

Comments
 (0)