From a834db5dc933a4b48c8323ae3e490448a86b448f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 4 Jul 2018 13:59:24 +0200
Subject: use private bind mounts for pacserve, remove pacdbserve

We want just one service to serve database files and package archives.
Private bind mounts make both available to pacserve. This alse removes
some complexity in pacredir.
---
 avahi/pacdbserve.service.in | 15 ---------------
 avahi/pacserve.service.in   |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 avahi/pacdbserve.service.in

(limited to 'avahi')

diff --git a/avahi/pacdbserve.service.in b/avahi/pacdbserve.service.in
deleted file mode 100644
index 106bc28..0000000
--- a/avahi/pacdbserve.service.in
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-
-<!-- See avahi.service(5) for more information about this configuration file -->
-
-<service-group>
-
-  <name replace-wildcards="yes">%h</name>
-
-  <service>
-    <type>_pacdbserve_%ID%_%ARCH%._tcp</type>
-    <port>7079</port>
-  </service>
-
-</service-group>
diff --git a/avahi/pacserve.service.in b/avahi/pacserve.service.in
index 2da20f7..4a39e6d 100644
--- a/avahi/pacserve.service.in
+++ b/avahi/pacserve.service.in
@@ -8,7 +8,7 @@
   <name replace-wildcards="yes">%h</name>
 
   <service>
-    <type>_pacserve_%ID%._tcp</type>
+    <type>_pacserve_%ID%_%ARCH%._tcp</type>
     <port>7078</port>
   </service>
 
-- 
cgit v1.2.3-70-g09d2