From cdbb05bf6a2864077f905cb96353e83f5b2b9ea8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Sat, 13 May 2017 12:30:08 +0200
Subject: add distribution ID to avahi service names

Now that we have pacredir in official repositories... ArchLinux ARM will
have the package as well, having package names (at least for 'any') clash.
So add distribution ID to avahi service names.

This is incompatible with pacredir < 0.2.3, so make sure to update all
your installations.
---
 avahi/pacdbserve.service.in |  2 +-
 avahi/pacserve.service      | 15 ---------------
 avahi/pacserve.service.in   | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 avahi/pacserve.service
 create mode 100644 avahi/pacserve.service.in

(limited to 'avahi')

diff --git a/avahi/pacdbserve.service.in b/avahi/pacdbserve.service.in
index ee6a9bb..106bc28 100644
--- a/avahi/pacdbserve.service.in
+++ b/avahi/pacdbserve.service.in
@@ -8,7 +8,7 @@
   <name replace-wildcards="yes">%h</name>
 
   <service>
-    <type>_pacdbserve_%ARCH%._tcp</type>
+    <type>_pacdbserve_%ID%_%ARCH%._tcp</type>
     <port>7079</port>
   </service>
 
diff --git a/avahi/pacserve.service b/avahi/pacserve.service
deleted file mode 100644
index 568d08d..0000000
--- a/avahi/pacserve.service
+++ /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>_pacserve._tcp</type>
-    <port>7078</port>
-  </service>
-
-</service-group>
diff --git a/avahi/pacserve.service.in b/avahi/pacserve.service.in
new file mode 100644
index 0000000..2da20f7
--- /dev/null
+++ b/avahi/pacserve.service.in
@@ -0,0 +1,15 @@
+<?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>_pacserve_%ID%._tcp</type>
+    <port>7078</port>
+  </service>
+
+</service-group>
-- 
cgit v1.2.3-70-g09d2