summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-10-20 21:34:45 +0200
committerChristian Poessinger <christian@poessinger.com>2021-10-20 21:34:45 +0200
commit1d89e5196611f06bc1d0f925fc2ac1cb4a5536ec (patch)
treeadc3efca73a769c5861a317b838e99e6abe769c4 /src
parent69aa8ca0aa93575c3758c9d6a86c37159848116c (diff)
downloadvyos-1x-1d89e5196611f06bc1d0f925fc2ac1cb4a5536ec.tar.gz
vyos-1x-1d89e5196611f06bc1d0f925fc2ac1cb4a5536ec.zip
mdns: T3917: move avahi configuration file to /run
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/service_mdns-repeater.py4
-rw-r--r--src/etc/systemd/system/avahi-daemon.service.d/override.conf8
2 files changed, 10 insertions, 2 deletions
diff --git a/src/conf_mode/service_mdns-repeater.py b/src/conf_mode/service_mdns-repeater.py
index 55b568e48..d31a0c49e 100755
--- a/src/conf_mode/service_mdns-repeater.py
+++ b/src/conf_mode/service_mdns-repeater.py
@@ -28,7 +28,7 @@ from vyos import ConfigError
from vyos import airbag
airbag.enable()
-config_file = '/etc/avahi/avahi-daemon.conf'
+config_file = '/run/avahi-daemon/avahi-daemon.conf'
vrrp_running_file = '/run/mdns_vrrp_active'
def get_config(config=None):
@@ -106,7 +106,7 @@ def apply(mdns):
else:
if 'vrrp_disable' not in mdns and os.path.exists(vrrp_running_file):
os.unlink(vrrp_running_file)
-
+
if mdns['vrrp_exists'] and 'vrrp_disable' in mdns:
if not os.path.exists(vrrp_running_file):
os.mknod(vrrp_running_file) # vrrp script looks for this file to update mdns repeater
diff --git a/src/etc/systemd/system/avahi-daemon.service.d/override.conf b/src/etc/systemd/system/avahi-daemon.service.d/override.conf
new file mode 100644
index 000000000..a9d2085f7
--- /dev/null
+++ b/src/etc/systemd/system/avahi-daemon.service.d/override.conf
@@ -0,0 +1,8 @@
+[Unit]
+After=
+After=vyos-router.service
+ConditionPathExists=/run/avahi-daemon/avahi-daemon.conf
+
+[Service]
+ExecStart=
+ExecStart=/usr/sbin/avahi-daemon --syslog --file /run/avahi-daemon/avahi-daemon.conf \ No newline at end of file