fixes to last commit

diff --git a/brc2 b/brc2
index 9e2b5483c5a5ae229ca6fcf992b46085ae38c5bc..5804466f05c8d243edc4f5dca748eef087a857ff 100644 (file)
--- a/brc2
+++ b/brc2
@@ -2652,7 +2652,9 @@ host-info-update() {
 
 
     if [[ $opts == user=root ]]; then
-      root_hosts+=($host i$host)
+      # note: the b8.nz suffix is for the User part, the IdentityFile
+      # part is redundant to *.b8.nz.
+      root_hosts+=($host i$host $host.b8.nz i$host.b8.nz)
     else
       nonroot_hosts+=($host i$host)
     fi
@@ -2732,10 +2734,10 @@ EOF
     echo "cat <<EOF"
     for host in ${!host_ips[@]}; do
       ipsuf=${host_ips[$host]}
-      echo "dhcp-host=${host_macs[$host]},set:$host,\$l.7,$host"
+      echo "dhcp-host=${host_macs[$host]},set:$host,\$l.$ipsuf,$host"
     done
     echo "EOF"
-  } | u /p/dnsmaq-data
+  } | u /p/dnsmasq-data
 
   {
     for host in ${!nonvpn_ips[@]}; do