From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 4 Jun 2018 13:26:21 +0000 (+0200)
Subject: distro: move tmpfiles
X-Git-Tag: v2.4.0~1^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc26280244094f7f22e06565eea3ff69ea882762;p=thirdparty%2Fknot-resolver.git

distro: move tmpfiles
---

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 621de0808..963bf9c54 100644
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -50,7 +50,7 @@ package() {
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-tls.socket" "${pkgdir}/usr/lib/systemd/system/kresd-tls.socket"
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd@.service" "${pkgdir}/usr/lib/systemd/system/kresd@.service"
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/doc/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
-	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
+	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
 	install -dm 0775 "${pkgdir}/etc/knot-resolver"
 	install -Dm 0644 "${srcdir}/kresd.conf" "${pkgdir}/etc/knot-resolver/kresd.conf"
 	install -Dm 0664 "${srcdir}/root.keys" "${pkgdir}/etc/knot-resolver/root.keys"
diff --git a/systemd/tmpfiles/knot-resolver.conf b/distro/common/tmpfiles/knot-resolver.conf
similarity index 100%
rename from systemd/tmpfiles/knot-resolver.conf
rename to distro/common/tmpfiles/knot-resolver.conf
diff --git a/distro/deb/debian/knot-resolver.install b/distro/deb/debian/knot-resolver.install
index e899478aa..0b893eff9 100644
--- a/distro/deb/debian/knot-resolver.install
+++ b/distro/deb/debian/knot-resolver.install
@@ -5,7 +5,7 @@ systemd/kresd-control@.socket lib/systemd/system/
 systemd/kresd-tls.socket lib/systemd/system/
 systemd/kresd.socket lib/systemd/system/
 systemd/kresd@.service lib/systemd/system/
-systemd/tmpfiles/knot-resolver.conf usr/lib/tmpfiles.d/
+distro/common/tmpfiles/knot-resolver.conf usr/lib/tmpfiles.d/
 usr/lib/knot-resolver/*.so
 usr/lib/knot-resolver/daf.lua
 usr/lib/knot-resolver/daf/
diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 7f8e38874..5fdd6b2f5 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -155,7 +155,7 @@ install -m 0644 -p %{repodir}/systemd/kresd-tls.socket %{buildroot}%{_unitdir}/k
 
 # install tmpfiles.d
 mkdir -p %{buildroot}%{_tmpfilesdir}
-install -m 0644 -p %{repodir}/systemd/tmpfiles/knot-resolver.conf %{buildroot}%{_tmpfilesdir}/knot-resolver.conf
+install -m 0644 -p %{repodir}/distro/common/tmpfiles/knot-resolver.conf %{buildroot}%{_tmpfilesdir}/knot-resolver.conf
 mkdir -p %{buildroot}%{_rundir}
 install -m 0750 -d %{buildroot}%{_rundir}/knot-resolver