From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 1 Aug 2023 09:03:29 +0000 (+0200)
Subject: Merge pull request #13088 from rgacogne/ddist-remove-useless-user-group-unit-sed
X-Git-Tag: rec-5.0.0-alpha1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=722b0d93d3a57b2f26ae34bda7f3ef19db9b694b;p=thirdparty%2Fpdns.git

Merge pull request #13088 from rgacogne/ddist-remove-useless-user-group-unit-sed

dnsdist: Stop passing -u dnsdist -g dnsdist on systemd's ExecStart
---

722b0d93d3a57b2f26ae34bda7f3ef19db9b694b
diff --cc builder-support/specs/dnsdist.spec
index d1e4e0939a,dd11d3e6da..0e027abd88
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@@ -113,9 -110,8 +110,7 @@@ make %{?_smp_mflags} check || (cat test
  %make_install
  install -d %{buildroot}/%{_sysconfdir}/dnsdist
  %{__mv} %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf-dist %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf
 -chgrp dnsdist %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.conf
  chmod 0640 %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.conf
- sed -i "s,/^\(ExecStart.*\)dnsdist\(.*\)\$,\1dnsdist -u dnsdist -g dnsdist\2," %{buildroot}/%{_unitdir}/dnsdist.service
- sed -i "s,/^\(ExecStart.*\)dnsdist\(.*\)\$,\1dnsdist -u dnsdist -g dnsdist\2," %{buildroot}/%{_unitdir}/dnsdist@.service
  
  %pre
  getent group dnsdist >/dev/null || groupadd -r dnsdist