rpms/setroubleshoot
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Install sysusers configuration

Browse Source 
User and group are now created by the macro but the configuration file
should be installed on the systemd too:
https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation

Also remove the Requires(pre) for useradd & groupadd as it is handled by
the %sysusers_create_compat macro:
https://src.fedoraproject.org/rpms/systemd/blob/rawhide/f/macros.sysusers

Related: rhbz#2145149
This commit is contained in:
Timothée Ravier 2022-02-09 11:56:04 +01:00 committed by Petr Lautrbach
parent 76ecc2b66c
commit 39fa7d5495
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setroubleshoot.spec
View File

@ -84,6 +84,7 @@ touch %{buildroot}%{pkgvardatadir}/email_alert_recipients
rm -rf %{buildroot}/usr/share/doc/ rm -rf %{buildroot}/usr/share/doc/
# create /run/setroubleshoot on boot # create /run/setroubleshoot on boot
install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysusersdir}/%{name}.conf
%find_lang %{name} %find_lang %{name}
@ -106,7 +107,6 @@ Requires: dbus
Requires: python3-dbus python3-dasbus Requires: python3-dbus python3-dasbus
Requires: polkit Requires: polkit
Requires: initscripts-service Requires: initscripts-service
Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
%description server %description server
Provides tools to help diagnose SELinux problems. When AVC messages Provides tools to help diagnose SELinux problems. When AVC messages
@ -187,6 +187,7 @@ to user preference. The same tools can be run on existing log files.
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
%{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
%attr(0644,root,root) %{_tmpfilesdir}/%{name}.conf %attr(0644,root,root) %{_tmpfilesdir}/%{name}.conf
%attr(0644,root,root) %{_sysusersdir}/%{name}.conf
%attr(0711,setroubleshoot,setroubleshoot) %dir %{_rundir}/setroubleshoot %attr(0711,setroubleshoot,setroubleshoot) %dir %{_rundir}/setroubleshoot
%doc AUTHORS COPYING ChangeLog DBUS.md NEWS README TODO %doc AUTHORS COPYING ChangeLog DBUS.md NEWS README TODO