diff options
| author | Christian Poessinger <christian@poessinger.com> | 2017-12-09 13:37:05 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2017-12-09 13:37:05 +0100 |
| commit | b9b04defcf46f71b63131b1b58fb02c6b9b914a1 (patch) | |
| tree | d3fbd69057d9c5f7e5b93e0743737928beefa6b2 | |
| parent | 375025afcd10dbfdf582c7b2691fe8efd39b107e (diff) | |
| parent | 608b67677a715f6c34b7fc8b2ba231c54c5d36d2 (diff) | |
| download | vyos-build-b9b04defcf46f71b63131b1b58fb02c6b9b914a1.tar.gz vyos-build-b9b04defcf46f71b63131b1b58fb02c6b9b914a1.zip | |
Merge branch 't378-mdns-repeater' into current
* t378-mdns-repeater:
Updated 'vyos-world' and 'vyos-1x' submodule
Added 'mdns-repeater' submodule
Remove 'vyos-cfg-avahi' submodule (superseeded) (T378)
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/18-enable-disable_services.chroot | 4 | ||||
| m--------- | packages/mdns-repeater | 0 | ||||
| m--------- | packages/vyos-1x | 0 | ||||
| m--------- | packages/vyos-cfg-avahi | 0 | ||||
| m--------- | packages/vyos-world | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 26527065..2b39b086 100644 --- a/.gitmodules +++ b/.gitmodules @@ -127,9 +127,9 @@ [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 [submodule "packages/vyos-bcast-relay"] path = packages/vyos-bcast-relay url = https://github.com/c-po/vyos-bcast-relay.git +[submodule "packages/mdns-repeater"] + path = packages/mdns-repeater + url = https://github.com/vyos/mdns-repeater.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 b6609fa7..6ba7950f 100755 --- a/data/live-build-config/hooks/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/18-enable-disable_services.chroot @@ -28,5 +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 +/usr/sbin/update-rc.d -f mdns-repeater remove +systemctl disable mdns-repeater diff --git a/packages/mdns-repeater b/packages/mdns-repeater new file mode 160000 +Subproject 051977458f4078a06008bb6c6fd338cd994cf56 diff --git a/packages/vyos-1x b/packages/vyos-1x -Subproject ac6071ae85bee52793f6dc34c2b60e333149291 +Subproject ae1e4c704bb324831fb15b6e243710f94700d3f diff --git a/packages/vyos-cfg-avahi b/packages/vyos-cfg-avahi deleted file mode 160000 -Subproject 31448bde1bc3484bf62114f168749d418bf70b0 diff --git a/packages/vyos-world b/packages/vyos-world -Subproject 416bee9c0a634f8513904f18556bb6d40e9fd2a +Subproject bd86d016c2e0d5342f9610c28855f13d0316acf |