Prefer /run over /var/run (rhbz#1710635)

epel9
Terje Røsten 5 years ago
parent e24a065f4c
commit d9d4410a87

@ -44,7 +44,7 @@ index cf6c461..777156a 100644
def run_dir def run_dir
- which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") - which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
+ which_dir("/var/run/puppet", "~/.puppet/var/run") + which_dir("/run/puppet", "~/.puppet/var/run")
end end
def log_dir def log_dir

@ -31,7 +31,7 @@
Name: puppet Name: puppet
Version: 5.5.10 Version: 5.5.10
Release: 7%{?dist} Release: 8%{?dist}
Summary: A network tool for managing many disparate systems Summary: A network tool for managing many disparate systems
License: ASL 2.0 License: ASL 2.0
URL: http://puppetlabs.com URL: http://puppetlabs.com
@ -221,7 +221,7 @@ sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \
%if 0%{?fedora} >= 15 %if 0%{?fedora} >= 15
# Setup tmpfiles.d config # Setup tmpfiles.d config
mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{_tmpfilesdir}
echo "D /var/run/%{name} 0755 %{name} %{name} -" > \ echo "D /run/%{name} 0755 %{name} %{name} -" > \
%{buildroot}%{_tmpfilesdir}/%{name}.conf %{buildroot}%{_tmpfilesdir}/%{name}.conf
%endif %endif
@ -389,6 +389,9 @@ fi
exit 0 exit 0
%changelog %changelog
* Sun Sep 22 2019 Terje Rosten <terje.rosten@ntnu.no> - 5.5.10-8
- Prefer /run over /var/run (rhbz#1710635)
* Sun Sep 22 2019 Terje Rosten <terje.rosten@ntnu.no> - 5.5.10-7 * Sun Sep 22 2019 Terje Rosten <terje.rosten@ntnu.no> - 5.5.10-7
- Drop buildroot prefix in nm_dispatcher_dir macro - Drop buildroot prefix in nm_dispatcher_dir macro
- Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), - Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385),

Loading…
Cancel
Save