From e926e9591de0aaa2bf822989d1477fe8e4dd01fb Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 28 Aug 2013 20:24:20 +0300
Subject: [PATCH] avahi: always start if not cinfigured via settings addon

---
 packages/network/avahi/default.d/avahi.conf           |  0
 packages/network/avahi/package.mk                     |  6 +++++-
 packages/network/avahi/system.d/avahi-daemon.service  |  3 ++-
 .../network/avahi/system.d/avahi-defaults.service     | 11 +++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 packages/network/avahi/default.d/avahi.conf
 create mode 100644 packages/network/avahi/system.d/avahi-defaults.service

diff --git a/packages/network/avahi/default.d/avahi.conf b/packages/network/avahi/default.d/avahi.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk
index 8277848714..b9cad08c9c 100644
--- a/packages/network/avahi/package.mk
+++ b/packages/network/avahi/package.mk
@@ -101,12 +101,16 @@ post_makeinstall_target() {
   rm -f $INSTALL/usr/bin/avahi-bookmarks
   rm -f $INSTALL/usr/bin/avahi-publish*
   rm -f $INSTALL/usr/bin/avahi-resolve*
+
+  mkdir -p $INSTALL/usr/share/services
+    cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services
+
 }
 
 post_install() {
   add_user avahi x 495 495 "avahi-daemon" "/var/run/avahi-daemon" "/bin/sh"
   add_group avahi 495
 
+  enable_service avahi-defaults.service
   enable_service avahi-daemon.service
 }
-
diff --git a/packages/network/avahi/system.d/avahi-daemon.service b/packages/network/avahi/system.d/avahi-daemon.service
index 4295c126bf..25d69cdec6 100644
--- a/packages/network/avahi/system.d/avahi-daemon.service
+++ b/packages/network/avahi/system.d/avahi-daemon.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Avahi Daemon
-After=syslog.target
+After=syslog.target avahi-defaults.service
+Requires=avahi-defaults.service
 
 ConditionPathExists=/storage/.cache/services/avahi.conf
 
diff --git a/packages/network/avahi/system.d/avahi-defaults.service b/packages/network/avahi/system.d/avahi-defaults.service
new file mode 100644
index 0000000000..8deedac06e
--- /dev/null
+++ b/packages/network/avahi/system.d/avahi-defaults.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Avahi defaults
+After=local-fs.target
+
+ConditionPathExists=!/storage/.cache/services/avahi.conf
+ConditionPathExists=!/storage/.cache/services/avahi.disabled
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'cp /usr/share/services/avahi.conf /storage/.cache/services'
+RemainAfterExit=yes