From d9d4410a878d7efda46b526dc855ba808cb6dbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 22 Sep 2019 11:54:12 +0200 Subject: [PATCH] Prefer /run over /var/run (rhbz#1710635) --- 0001-Fix-puppet-paths.patch | 2 +- puppet.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch index 423ced3..6034a89 100644 --- a/0001-Fix-puppet-paths.patch +++ b/0001-Fix-puppet-paths.patch @@ -44,7 +44,7 @@ index cf6c461..777156a 100644 def run_dir - which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") -+ which_dir("/var/run/puppet", "~/.puppet/var/run") ++ which_dir("/run/puppet", "~/.puppet/var/run") end def log_dir diff --git a/puppet.spec b/puppet.spec index b7445e2..484fc11 100644 --- a/puppet.spec +++ b/puppet.spec @@ -31,7 +31,7 @@ Name: puppet Version: 5.5.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -221,7 +221,7 @@ sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ %if 0%{?fedora} >= 15 # Setup tmpfiles.d config mkdir -p %{buildroot}%{_tmpfilesdir} -echo "D /var/run/%{name} 0755 %{name} %{name} -" > \ +echo "D /run/%{name} 0755 %{name} %{name} -" > \ %{buildroot}%{_tmpfilesdir}/%{name}.conf %endif @@ -389,6 +389,9 @@ fi exit 0 %changelog +* Sun Sep 22 2019 Terje Rosten - 5.5.10-8 +- Prefer /run over /var/run (rhbz#1710635) + * Sun Sep 22 2019 Terje Rosten - 5.5.10-7 - Drop buildroot prefix in nm_dispatcher_dir macro - Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385),