Directory variables.

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}
 }
 

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}

rc.subr

@@ -330,6 +330,9 @@ 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