From a7124f5d1d877569fe700bf6469e48ab5178a490801666bbcd1ce0d8b8dcbf16 Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Mon, 31 Aug 2026 19:52:37 -0400
Subject: [PATCH] Build sysctl file primitive.

---
 rc.d/build_sysctl | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 rc.d/fib_setup    | 42 -----------------------------------
 2 files changed, 56 insertions(+), 42 deletions(-)
 create mode 100755 rc.d/build_sysctl
 delete mode 100755 rc.d/fib_setup

diff --git a/rc.d/build_sysctl b/rc.d/build_sysctl
new file mode 100755
index 0000000..d37358e
--- /dev/null
+++ b/rc.d/build_sysctl
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# PROVIDE: build_sysctl
+# BEFORE: sysctl
+#
+
+. ${RC_ROUTER_HARNESS}/etc/rc.subr
+
+name="build_sysctl"
+desc="Build dynamic sysctl entries from rc.router configurations"
+
+start_cmd='fbuild_sysctl_start'
+stop_cmd='build_sysctl_stop'
+rcvar='build_sysctl_enable'
+
+load_rc_config 'build_sysctl'
+
+build_sysctl_start()
+{
+    echo 'Running `build_sysctl`'
+    fib_count=$(( ${rc_router_fibs} ))
+	max_fib=$(( ${fib_count} - 1 ))
+
+    
+	rm -f ${rc_router_gen_dir}/sysctl.conf
+
+    cat ${rc_router_dir}/templates/sysctl.conf >> ${rc_router_gen_dir}/sysctl.conf
+
+	### Special variables
+    echo "net.fibs=${fib_count}" >> ${rc_router_gen_dir}/sysctl.conf
+    echo "net.inet6.ip6.=${fib_count}" >> ${rc_router_gen_dir}/sysctl.conf
+
+	if [ $( option_selected rc_router_enable_class_e ) ]
+	then
+		echo "net.inet.ip.allow_net240=1" >> ${rc_router_gen_dir}/sysctl.conf
+	fi
+
+	if [ ! -e ${RC_ROUTER_HARNESS}/etc/sysctl.conf.local ] 
+	then
+		ln -s ${rc_router_gen_dir}/sysctl.conf ${RC_ROUTER_HARNESS}/etc/sysctl.conf.local
+	fi
+}
+
+build_sysctl_stop()
+{
+	true
+}
+
+
+
+################ Epilogue
+
+run_rc_command "$1"
+
+# vim: ft=bash
+
diff --git a/rc.d/fib_setup b/rc.d/fib_setup
deleted file mode 100755
index 6a51b0f..0000000
--- a/rc.d/fib_setup
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: fib_setup
-# BEFORE: sysctl
-#
-
-. ${RC_ROUTER_HARNESS}/etc/rc.subr
-
-name="fib_setup"
-desc="Calculate and respect the fib count"
-
-start_cmd='fib_setup_start'
-stop_cmd='fib_setup_stop'
-rcvar='fib_setup_enable'
-
-load_rc_config 'fib_setup'
-
-fib_setup_start()
-{
-    echo "Running fib_setup"
-    fib_count=$(( ${rc_router_fibs} ))
-	max_fibs=$(( ${fib_count} + 1 ))
-    
-    cp ${rc_router_dir}/templates/sysctl.conf ${rc_router_gen_dir}/
-    echo "net.fibs=${fib_count}" >> ${rc_router_gen_dir}/sysctl.conf
-}
-
-fib_setup_stop()
-{
-	true
-}
-
-
-
-################ Epilogue
-
-run_rc_command "$1"
-
-# vim: ft=bash
-