isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create template tmpfiles.d/sudo.conf for installation instead of

Browse Source 
creating one via echo commands in the Makefile.

Add --enable-tmpfiles.d configure option to enable/disable use of
tmpfiles.d and override the default directory.

Use --disable-tmpfiles.d in mkpkg so we no longer need to ignore
tmpfiles.d/sudo.conf in sudo.pp.
This commit is contained in:
Todd C. Miller
2015-04-07 15:35:01 -06:00
parent d297f5fd84
commit fa3552fa76
9 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sudo.pp
View File

@@ -320,10 +320,6 @@ still allow people to get their work done."
/sbin/init.d/ ignore
/sbin/init.d/sudo 0755 root:
%endif
%if -d ${pp_destdir}/usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/ ignore
/usr/lib/tmpfiles.d/* ignore
%endif
%files [!aix]
$mandir/man*/* 0644
@@ -411,7 +407,7 @@ still allow people to get their work done."
%post [rpm,deb]
# Create /usr/lib/tmpfiles.d/sudo.conf if systemd is configured.
if [ -r /usr/lib/tmpfiles.d/systemd.conf ]; then
if [ -f /usr/lib/tmpfiles.d/systemd.conf ]; then
cat > /usr/lib/tmpfiles.d/sudo.conf <<-EOF
d %{rundir} 0711 root root
D %{rundir}/ts 0700 root root