Merge pull request #238 from mekanix/feature/ipv6-network

Set default router via DHCPv6, too

scripts/master-init.sh

@@ -45,6 +45,7 @@ setup() {
   echo "#!/bin/sh" >"${CBSD_WORKDIR}/jails-system/network/master_poststart.d/reggae.sh"
   echo "service reggae onerestart" >>"${CBSD_WORKDIR}/jails-system/network/master_poststart.d/reggae.sh"
   chmod +x "${CBSD_WORKDIR}/jails-system/network/master_poststart.d/reggae.sh"
+  mkdir /var/run/reggae &>/dev/null
   cbsd jset jname=${SERVICE} b_order=0
   cbsd jstart ${SERVICE}
   cbsd jexec jname=${SERVICE} cmd="env ASSUME_ALWAYS_YES=YES pkg bootstrap"

scripts/network-init.sh

@@ -89,9 +89,7 @@ setup_hostname() {
 setup_rtadvd() {
   sysrc rtadvd_enable="YES"
   sysrc rtadvd_interfaces="cbsd0"
-  sed \
-    -e "s;IPV6_PREFIX;${IPV6_PREFIX};g" \
-    "${SCRIPT_DIR}/../templates/rtadvd.conf" >/etc/rtadvd.conf
+  cp "${SCRIPT_DIR}/../templates/rtadvd.conf" /etc/rtadvd.conf
 }
 
 

templates/dhcpd6.conf

@@ -43,6 +43,9 @@ option dhcp6.info-refresh-time 21600;
 # The path of the lease file
 dhcpv6-lease-file-name "/var/db/dhcpd6.leases";
 
+option dhcp6.next-hop code 242 = ip6-address;
+option dhcp6.next-hop IPV6_PREFIX:1;
+
 # The subnet where the server is attached
 #  (i.e., the server has an address in this subnet)
 subnet6 IPV6_PREFIX:/64 {

templates/rtadvd.conf

@@ -1 +1,4 @@
-cbsd0:addr="IPV6_PREFIX":raflags="mo"
+# Uncomment next line if you want specific range,
+# and not automatically deduced one
+#cbsd0:addr="IPV6_PREFIX":raflags="mo"
+cbsd0:raflags="mo"