From 60226c782addfc7622d278965f3ecc7c09373adb9493d51762eee87817dd67d5 Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Thu, 14 May 2026 13:23:27 -0400
Subject: [PATCH] Directory variables.

---
 rc.d/allow_hosts        | 2 +-
 rc.d/clear_route_policy | 4 ++--
 rc.subr                 | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/rc.d/allow_hosts b/rc.d/allow_hosts
index 5812e8a..971f689 100755
--- a/rc.d/allow_hosts
+++ b/rc.d/allow_hosts
@@ -28,7 +28,7 @@ fi
 allow_hosts_start()
 {
     echo "Running allow hosts"
-    echo "include \"${allow_hosts_rules}\"" > /etc/router-conf/gen/pf.rules.conf
+    echo "include \"${allow_hosts_rules}\"" > ${rc_router_gen_dir}/pf.rules.conf
     pfctl -a allow-hosts -f ${allow_hosts_rules}
 }
 
diff --git a/rc.d/clear_route_policy b/rc.d/clear_route_policy
index ede629d..1220ea4 100755
--- a/rc.d/clear_route_policy
+++ b/rc.d/clear_route_policy
@@ -27,7 +27,7 @@ fi
 
 clear_route_policy_start()
 {
-    echo "" > ${route_policy_file}
+    echo "" > ${rc_router_gen_dir}/pf.rules.conf
     pfctl -a allow-hosts -f /dev/null
     clear_all_policies
     #pfctl -a route-policies -f ${route_policy_file}
@@ -35,7 +35,7 @@ clear_route_policy_start()
 
 clear_route_policy_stop()
 {
-    echo "" > ${route_policy_file}
+    echo "" > ${rc_router_gen_dir}/pf.rules.conf
     pfctl -a allow-hosts -f /dev/null
     clear_all_policies
     #pfctl -a route-policies -f ${route_policy_file}
diff --git a/rc.subr b/rc.subr
index 5340541..2684ab9 100755
--- a/rc.subr
+++ b/rc.subr
@@ -329,7 +329,10 @@ add_v4_isp()
 {
 	_iface="${1}" ; shift 1
 	eval ifconfig_${_iface}="$*"
-	
+
+	dhcpd_enable="YES"
+	gateway_enable="YES"
+	pf_enable="YES"
 }
 
 add_v6_isp()
@@ -356,7 +359,7 @@ add_v6_isp()
 		ipv6_default_interface="${_iface}"
 		ipv6_cpe_wanif="${_iface}"
         ipv6_isp_interfaces="${ipv6_isp_interfaces} ${_iface}"
-		dhcp_6c_enable="YES"
+		dhcp6c_enable="YES"
 		dhcp6c_config="${rc_router_gen_dir}/dhcp6c.conf"
 	fi