don't have distros we aren't booting waiting to boot without pass

[automated-distro-installer] / wrt-setup

diff --git a/wrt-setup b/wrt-setup
index 1531c4f32f17c8c66fb45fe38f07d82addced723..beea6b1b1639fd8a6b0dcc0866533e3409bb07f3 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -225,13 +225,15 @@ EOF
 dnsmasq_restart=false
 cedit /etc/hosts <<EOF || dnsmasq_restart=true
 192.168.1.1 wrt
-192.168.1.2 treetowl
-192.168.1.3 frodo faiserver
+192.168.1.2 treetowl faiserver
+192.168.1.3 frodo
 192.168.1.4 htpc
 192.168.1.5 x2
 192.168.1.6 testvm
 192.168.1.8 tp
 72.14.176.105 li
+173.255.202.210 lj
+23.239.31.172 lk
 EOF
 
 
@@ -257,23 +259,25 @@ cedit /etc/dnsmasq.conf <<'EOF' || dnsmasq_restart=true
 # in a browsing session, I probably won't ever do 5000 lookups
 # before the ttl expiration or whatever does expiration.
 cache-size=10000
+# ask all servers, use the one which responds first.
 # http://ma.ttwagner.com/make-dns-fly-with-dnsmasq-all-servers/
 all-servers
-# namebench showed 4 servers fairly close ranking:
+# namebench showed 4 servers fairly close ranking.
 # qwest
-server=205.171.3.65
-server=205.171.2.25
+#server=205.171.3.65
+#server=205.171.2.25
 # clearwire anchorage
-server=64.13.115.12
+#server=64.13.115.12
 # comcast spokane
-server=68.87.69.146
+#server=68.87.69.146
 # google
 server=8.8.4.4
+server=8.8.8.8
 # NTT
-server=129.250.35.250
+#server=129.250.35.250
 # isp servers
-server=75.75.76.76
-server=75.75.75.75
+#server=75.75.76.76
+#server=75.75.75.75
 
 
 
@@ -281,25 +285,30 @@ server=75.75.75.75
 # sudo dhclient -r; sudo dhclient <interface-name>
 
 # default dhcp range is 100-150
-dhcp-host=00:15:17:d2:1a:1c,192.168.1.2,treetowl
-dhcp-host=00:26:18:97:bb:16,192.168.1.3,frodo
-dhcp-host=10:78:d2:da:29:22,192.168.1.4,htpc
-dhcp-host=00:1f:16:16:39:24,192.168.1.5,x2
+dhcp-host=f4:6d:04:02:ed:66,set:treetowl,192.168.1.2,treetowl
+dhcp-host=00:26:18:97:bb:16,set:frodo,192.168.1.3,frodo
+dhcp-host=10:78:d2:da:29:22,set:htpc,192.168.1.4,htpc
+dhcp-host=00:1f:16:16:39:24,set:x2,192.168.1.5,x2
 # 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,192.168.1.6,demohost
-dhcp-host=52:54:00:56:09:f9,192.168.1.7,faiserver
-dhcp-host=80:fa:5b:1c:6e:cf,192.168.1.8,tp
+dhcp-host=52:54:00:9c:ef:ad,set:demohost,192.168.1.6,demohost
+dhcp-host=52:54:00:56:09:f9,set:faiserver,192.168.1.7,faiserver
+dhcp-host=80:fa:5b:1c:6e:cf,set:tp,192.168.1.8,tp
 # 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,192.168.1.251,switch9429ca
+dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,192.168.1.251,switch9429ca
 
 
 # template
 # dhcp-host=,192.168.1.,
+
+# Just leave the tftp server up even if we aren't doing pxe boot.
+# It has no sensitive info.
+enable-tftp
+tftp-root=/mnt/usb/tftpboot
 EOF
 
 if $dnsmasq_restart; then