From 357799bf47dd2f76180696ef4fac8e58d958ebc5 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 17 Feb 2023 14:27:37 +0100 Subject: [PATCH] package/skeleton-init-finit: add support for Frr 1. Use same naming standard for quagga and frr 2. Only one of quagga and frr can be used at the same time 3. Subdirectories in available/ only in the skeleton, not on target Signed-off-by: Joachim Wiberg --- .../skeleton-init-finit.mk | 32 ++++++++++++------- .../etc/finit.d/available/frr/babeld.conf | 1 + .../etc/finit.d/available/frr/isisd.conf | 1 + .../etc/finit.d/available/frr/ospf6d.conf | 1 + .../etc/finit.d/available/frr/ospfd.conf | 1 + .../etc/finit.d/available/frr/ripd.conf | 1 + .../etc/finit.d/available/frr/ripng.conf | 1 + .../etc/finit.d/available/frr/zebra.conf | 1 + .../quagga/{quagga-isisd.conf => isisd.conf} | 0 .../{quagga-ospf6d.conf => ospf6d.conf} | 0 .../quagga/{quagga-ospfd.conf => ospfd.conf} | 0 .../quagga/{quagga-ripd.conf => ripd.conf} | 0 .../quagga/{quagga-ripng.conf => ripng.conf} | 0 .../quagga/{quagga-zebra.conf => zebra.conf} | 0 14 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf rename package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/{quagga-isisd.conf => isisd.conf} (100%) rename package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/{quagga-ospf6d.conf => ospf6d.conf} (100%) rename package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/{quagga-ospfd.conf => ospfd.conf} (100%) rename package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/{quagga-ripd.conf => ripd.conf} (100%) rename package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/{quagga-ripng.conf => ripng.conf} (100%) rename package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/{quagga-zebra.conf => zebra.conf} (100%) diff --git a/package/skeleton-init-finit/skeleton-init-finit.mk b/package/skeleton-init-finit/skeleton-init-finit.mk index cd5d5886..62d174a3 100644 --- a/package/skeleton-init-finit/skeleton-init-finit.mk +++ b/package/skeleton-init-finit/skeleton-init-finit.mk @@ -78,6 +78,16 @@ endef SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_DROPBEAR endif +ifeq ($(BR2_PACKAGE_FRR),y) +define SKELETON_INIT_FINIT_SET_FRR + for svc in babeld bfdd bgpd eigrpd isisd ldpd pathd ripd ripng static ospfd ospf6d vrrpd zebra; do \ + cp $(SKELETON_INIT_FINIT_AVAILABLE)/frr/$$svc.conf $(FINIT_D)/available/$$svc.conf; \ + done + ln -sf ../available/zebra.conf $(FINIT_D)/enabled/zebra.conf +endef +SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_FRR +endif # BR2_PACKAGE_FRR + ifeq ($(BR2_PACKAGE_INADYN),y) define SKELETON_INIT_FINIT_SET_INADYN cp $(SKELETON_INIT_FINIT_AVAILABLE)/inadyn.conf $(FINIT_D)/available/ @@ -135,47 +145,47 @@ endif ifeq ($(BR2_PACKAGE_QUAGGA),y) define SKELETON_INIT_FINIT_SET_QUAGGA - cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/quagga-zebra.conf $(FINIT_D)/available/ + cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/zebra.conf $(FINIT_D)/available/ ln -sf ../available/zebra.conf $(FINIT_D)/enabled/zebra.conf endef SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA ifeq ($(BR2_PACKAGE_QUAGGA_ISISD),y) define SKELETON_INIT_FINIT_SET_QUAGGA_ISISD - cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/quagga-isisd.conf $(FINIT_D)/available/ - ln -sf ../available/quagga-isisd.conf $(FINIT_D)/enabled/quagga-isisd.conf + cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/isisd.conf $(FINIT_D)/available/ + ln -sf ../available/isisd.conf $(FINIT_D)/enabled/isisd.conf endef SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_ISISD endif ifeq ($(BR2_PACKAGE_QUAGGA_OSPFD),y) define SKELETON_INIT_FINIT_SET_QUAGGA_OSPFD - cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/quagga-ospfd.conf $(FINIT_D)/available/ - ln -sf ../available/quagga-ospfd.conf $(FINIT_D)/enabled/quagga-ospfd.conf + cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ospfd.conf $(FINIT_D)/available/ + ln -sf ../available/ospfd.conf $(FINIT_D)/enabled/ospfd.conf endef SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_OSPFD endif ifeq ($(BR2_PACKAGE_QUAGGA_OSP6D),y) define SKELETON_INIT_FINIT_SET_QUAGGA_OSP6D - cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/quagga-ospf6d.conf $(FINIT_D)/available/ - ln -sf ../available/quagga-ospf6d.conf $(FINIT_D)/enabled/quagga-ospf6d.conf + cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ospf6d.conf $(FINIT_D)/available/ + ln -sf ../available/ospf6d.conf $(FINIT_D)/enabled/ospf6d.conf endef SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_OSP6D endif ifeq ($(BR2_PACKAGE_QUAGGA_RIPD),y) define SKELETON_INIT_FINIT_SET_QUAGGA_RIPD - cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/quagga-ripd.conf $(FINIT_D)/available/ - ln -sf ../available/quagga-ripd.conf $(FINIT_D)/enabled/quagga-ripd.conf + cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ripd.conf $(FINIT_D)/available/ + ln -sf ../available/ripd.conf $(FINIT_D)/enabled/ripd.conf endef SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_RIPD endif ifeq ($(BR2_PACKAGE_QUAGGA_RIPNGD),y) define SKELETON_INIT_FINIT_SET_QUAGGA_RIPNG - cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/quagga-ripng.conf $(FINIT_D)/available/ - ln -sf ../available/quagga-ripng.conf $(FINIT_D)/enabled/quagga-ripng.conf + cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ripng.conf $(FINIT_D)/available/ + ln -sf ../available/ripng.conf $(FINIT_D)/enabled/ripng.conf endef SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_RIPNG endif diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf new file mode 100644 index 00000000..73c97060 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf @@ -0,0 +1 @@ +service [2345789] log:null babled -A 127.0.0.1 -u frr -g frr -- Babel routing daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf new file mode 100644 index 00000000..3126be62 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf @@ -0,0 +1 @@ +service [2345789] log:null isisd -A 127.0.0.1 -u frr -g frr -- IS-IS daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf new file mode 100644 index 00000000..dbf30047 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf @@ -0,0 +1 @@ +service [2345789] log:null ospf6d -A 127.0.0.1 -u frr -g frr -- OSPF IPv6 daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf new file mode 100644 index 00000000..f8daaa17 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf @@ -0,0 +1 @@ +service [2345789] log:null ospfd -A 127.0.0.1 -u frr -g frr -- OSPF daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf new file mode 100644 index 00000000..2bcc5758 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf @@ -0,0 +1 @@ +service [2345789] log:null ripd -A 127.0.0.1 -u frr -g frr -- RIP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf new file mode 100644 index 00000000..503b89bd --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf @@ -0,0 +1 @@ +service [2345789] log:null ripngd -A 127.0.0.1 -u frr -g frr -- RIP IPv6 daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf new file mode 100644 index 00000000..c94f1902 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf @@ -0,0 +1 @@ +service [2345789] pid:!/run/quagga/zebra.pid zebra -A 127.0.0.1 -u frr -g frr -- Zebra routing daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-isisd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/isisd.conf similarity index 100% rename from package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-isisd.conf rename to package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/isisd.conf diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ospf6d.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ospf6d.conf similarity index 100% rename from package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ospf6d.conf rename to package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ospf6d.conf diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ospfd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ospfd.conf similarity index 100% rename from package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ospfd.conf rename to package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ospfd.conf diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ripd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ripd.conf similarity index 100% rename from package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ripd.conf rename to package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ripd.conf diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ripng.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ripng.conf similarity index 100% rename from package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-ripng.conf rename to package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/ripng.conf diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-zebra.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/zebra.conf similarity index 100% rename from package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/quagga-zebra.conf rename to package/skeleton-init-finit/skeleton/etc/finit.d/available/quagga/zebra.conf