X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=wrt-setup-local;h=ddf78d6f64a08db91db0a97f2f99b8c8cfdb7692;hp=e043e7dfaf5b7f6b1249b409cdd6eac8e5568e6c;hb=f26c5d66d11fc97c3c6a17a3647dad5d1922fe5a;hpb=8d5ef1a7a61d7475823452f47f5b4cd7a06722e8

diff --git a/wrt-setup-local b/wrt-setup-local
index e043e7d..ddf78d6 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -329,14 +329,10 @@ $l.3 frodo
 $l.4 htpc
 $l.5 x2
 $l.6 demohost
-#$l.7 faiserver
+$l.7 x3
 $l.8 tp faiserver b8.nz
-$l.9 n5
-$l.10 so
-$l.12 fz
 72.14.176.105 li
-45.33.9.11 lj
-138.68.10.24 dopub
+
 # netns creation looks for next free subnet starting at 10.173, but I only
 # use one, and I would keep this one as the first created.
 10.173.0.2 transmission
@@ -424,16 +420,18 @@ dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
 dhcp-host=00:26:18:97:bb:16,set:frodo,$l.3,frodo
 dhcp-host=10:78:d2:da:29:22,set:htpc,$l.4,htpc
 dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
-#dhcp-host=00:c0:ca:27:e9:b2,set:x2w,$l.11,x2w
-#wireless interface
-# this is so fai can have an explicit name to use for testing,
+# This is so fai can have an explicit name to use for testing,
 # or else any random machine which did a pxe boot would get
 # reformatted. The mac is from doing a virt-install, cancelling it,
 # and copying the generated mac, so it should be randomish.
 dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.6,demohost
-#dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.7,faiserver
+dhcp-host=00:1f:16:14:01:d8,set:tp,$l.7,x3
 dhcp-host=80:fa:5b:1c:6e:cf,set:tp,$l.8,tp
-# this is the ip it picks by default if dhcp fails,
+
+# faiserver vm
+dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
+
+# This is the ip it picks by default if dhcp fails,
 # so might as well use it.
 # hostname is the name it uses according to telnet
 dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,$l.251,switch9429ca