distro: move tmpfiles

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 621de0808b76d9b062cd4645c6afb4131ef0d632..963bf9c54b1cfdcada9ad8bc73bdf40ddec3a507 100644 (file)
--- 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 e899478aac98679a5000ad526848d7f37c92c922..0b893eff9d0c4dc4dd10bfa76945dfebda6017a7 100644 (file)
--- 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 7f8e388749e213d92d01553599d5c63ba2bb16fd..5fdd6b2f509a668ced461e3231dbafdb52933cb8 100644 (file)
--- 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