summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-27 12:20:54 +0100
committerGitHub <noreply@github.com>2020-11-27 12:20:54 +0100
commitb35660db9bd641a9ffc4c21e2dce7379d08c458c (patch)
tree247376b302633dc4a830a4b8c4f8437c1b16646d
parent2228df50afbc7128125f2364cf95ed313872e4e9 (diff)
parent3429f16a5bfe62d468f6df5f925728ac38fb6e0b (diff)
downloadvyos-build-b35660db9bd641a9ffc4c21e2dce7379d08c458c.tar.gz
vyos-build-b35660db9bd641a9ffc4c21e2dce7379d08c458c.zip
Merge pull request #134 from DmitriyEshenko/fix-igmp-pim
pim: T2744: Disable pimd by default to prevent conflict
-rwxr-xr-xdata/live-build-config/hooks/live/30-frr-configs.chroot2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/live-build-config/hooks/live/30-frr-configs.chroot b/data/live-build-config/hooks/live/30-frr-configs.chroot
index e7873912..3180e36d 100755
--- a/data/live-build-config/hooks/live/30-frr-configs.chroot
+++ b/data/live-build-config/hooks/live/30-frr-configs.chroot
@@ -19,7 +19,7 @@ ospf6d=yes
ripd=yes
ripngd=yes
isisd=yes
-pimd=yes
+pimd=no
ldpd=yes
nhrpd=no
eigrpd=no