diff --git a/namedb/local-machines.defs b/namedb/local-machines.defs new file mode 100644 index 0000000..32030c7 --- /dev/null +++ b/namedb/local-machines.defs @@ -0,0 +1 @@ +demo=abcd:abff:fe12:3456 diff --git a/rc.conf b/rc.conf new file mode 100644 index 0000000..e123558 --- /dev/null +++ b/rc.conf @@ -0,0 +1,11 @@ +#!/bin/sh + +. ${router_conf_dir}/rc.subr + +localnet_zone_file="zone.hosts.nerdland.org" +localnet_zoneinfo_master_nameserver="ns.nerdland.org" +localnet_zoneinfo_email="adam.imp-net.work" +localnet_zoneinfo_domain="hosts.nerdland.org" +localnet_zoneinfo_nameservers="${localnet_zoneinfo_master_nameserver} xns.nerdland.org" +localnet_zoneinfo_subnet="31" +localnet_zoneinfo_enable="YES" diff --git a/rc.d/localnet b/rc.d/localnet index e99c1f8..2c3c4fa 100755 --- a/rc.d/localnet +++ b/rc.d/localnet @@ -16,7 +16,9 @@ # range address for the router itself (on a dedicated loopback device), and attach # the IMP_NET address for this machine to another loopback device. -. /etc/rc.subr +router_conf_dir="/home/adam/proj/rc.router" +. ${router_conf_dir}/rc.conf +#. /etc/rc.subr name='localnet' @@ -27,7 +29,7 @@ rebuild_rtadvd_conf_cmd="localnet_build_rtadv" rebuild_zoneinfo_cmd="localnet_build_zoneinfo" rcvar='localnet_enable' -load_rc_config 'localnet' +#load_rc_config 'localnet' localnet_first_nic="re0.301" @@ -36,7 +38,8 @@ localnet_first_nic="re0.301" localnet_build_zoneinfo() { - compute_addrs + #compute_addrs + isp_prefix="2001:db8:42:ab" localnet_build_zoneinfo_impl } @@ -45,6 +48,7 @@ localnet_build_zoneinfo_impl() { if [ $(option_selected localnet_zoneinfo_enable) = "YES" ] then + #build_zoneinfo ${isp_prefix} 31 ${router_conf_dir}/namedb/local-machines.defs build_zoneinfo ${isp_prefix} ${localnet_zoneinfo_subnet} ${router_conf_dir}/namedb/local-machines.defs > ${router_conf_dir}/gen/${localnet_zone_file} fi } @@ -137,6 +141,9 @@ localnet_stop() { ifconfig lo4 destroy } -run_rc_command "$1" +#run_rc_command "$1" + + +localnet_build_zoneinfo # vim: ft=bash diff --git a/rc.subr b/rc.subr index d2fdcb1..a547318 100644 --- a/rc.subr +++ b/rc.subr @@ -179,6 +179,7 @@ _compute_nets() then #echo "Error in configuration: No network class given" #exit 1 + sleep 0 fi _class=$1