From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 27 Sep 2022 16:24:16 +0000 (-0400)
Subject: pimd: Allow v6 to do non-integrated configuration
X-Git-Tag: base_8.4~4^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=661798c670c1eff933ae903434aac3b450ef0450;p=mirror%2Ffrr.git

pimd: Allow v6 to do non-integrated configuration

Proof:
eva# conf
eva(config)# no service integrated-vtysh-config
eva(config)# end
eva# wr mem
Note: this version of vtysh never writes vtysh.conf
Building Configuration...
Configuration saved to /etc/frr/zebra.conf
Configuration saved to /etc/frr/ripd.conf
Configuration saved to /etc/frr/ripngd.conf
Configuration saved to /etc/frr/ospfd.conf
Configuration saved to /etc/frr/ospf6d.conf
Configuration saved to /etc/frr/bgpd.conf
Configuration saved to /etc/frr/isisd.conf
Configuration saved to /etc/frr/pimd.conf
Configuration saved to /etc/frr/nhrpd.conf
Configuration saved to /etc/frr/eigrpd.conf
Configuration saved to /etc/frr/babeld.conf
Configuration saved to /etc/frr/sharpd.conf
Configuration saved to /etc/frr/fabricd.conf
Configuration saved to /etc/frr/pbrd.conf
Configuration saved to /etc/frr/staticd.conf
Configuration saved to /etc/frr/bfdd.conf
Configuration saved to /etc/frr/vrrpd.conf
Configuration saved to /etc/frr/pim6d.conf
eva#

Fixes: #12011
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/pimd/pim6_main.c b/pimd/pim6_main.c
index e0b5a87e05..1cae601fc1 100644
--- a/pimd/pim6_main.c
+++ b/pimd/pim6_main.c
@@ -120,8 +120,6 @@ static const struct frr_yang_module_info *const pim6d_yang_modules[] = {
 /* clang-format off */
 FRR_DAEMON_INFO(pim6d, PIM6,
 	.vty_port = 0,
-	.flags = FRR_NO_SPLIT_CONFIG,
-
 	.proghelp = "Protocol Independent Multicast (RFC7761) for IPv6",
 
 	.signals = pim6d_signals,