summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim <UnicronNL@users.noreply.github.com>2017-09-03 15:13:48 +0200
committerGitHub <noreply@github.com>2017-09-03 15:13:48 +0200
commit989f832ff9ddd394c87fa790f71e688d67fb479b (patch)
tree51766bb155419774aa1bea662181b1c35b229017
parent53bd0ad27836eee5be5caee0f34d15205800a510 (diff)
parent9b2c69ada85c87ff01457ada04cd9c33ddb8be59 (diff)
downloadvyos-build-989f832ff9ddd394c87fa790f71e688d67fb479b.tar.gz
vyos-build-989f832ff9ddd394c87fa790f71e688d67fb479b.zip
Merge pull request #10 from c-po/t378-avahi-mdns
T378 avahi mdns
-rw-r--r--.gitmodules3
-rwxr-xr-xdata/live-build-config/hooks/18-enable-disable_services.chroot2
m---------packages/vyos-cfg-avahi0
m---------packages/vyos-world0
4 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index d687ba52..54cc889d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -127,3 +127,6 @@
[submodule "packages/vyos-1x"]
path = packages/vyos-1x
url = https://github.com/vyos/vyos-1x.git
+[submodule "packages/vyos-cfg-avahi"]
+ path = packages/vyos-cfg-avahi
+ url = https://github.com/c-po/vyos-cfg-avahi.git
diff --git a/data/live-build-config/hooks/18-enable-disable_services.chroot b/data/live-build-config/hooks/18-enable-disable_services.chroot
index abb60241..b6609fa7 100755
--- a/data/live-build-config/hooks/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/18-enable-disable_services.chroot
@@ -28,3 +28,5 @@ systemctl disable lldpd
systemctl enable ssh-session-cleanup
/usr/sbin/update-rc.d -f conntrackd remove
systemctl disable conntrackd
+/usr/sbin/update-rc.d -f avahi-daemon remove
+systemctl disable avahi-daemon
diff --git a/packages/vyos-cfg-avahi b/packages/vyos-cfg-avahi
new file mode 160000
+Subproject 31448bde1bc3484bf62114f168749d418bf70b0
diff --git a/packages/vyos-world b/packages/vyos-world
-Subproject 28fa09078dfce814da1e6203d6dc1e6665b4e86
+Subproject e590f7431b3aeb56b4b8d61a490d42646b95014