various fixes and improvements

[automated-distro-installer] / wrt-setup

diff --git a/wrt-setup b/wrt-setup
index 4be2e41a9c905f3c46130a5ff511bbbf61b559c0..24aa3a03e55ff53af93229afa0d832c27f60893a 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -91,28 +91,32 @@ mkdir -p /run/archiso/bootmnt
 # todo: at some later time, i found /mnt/usb not mounted, watch to see if
 # that is the case after running this or rebooting.
 # wiki says safe to do in case of fstab changes:
-cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
-config global automount
-      option from_fstab 1
-      option anon_mount 1
-
-config global autoswap
-      option from_fstab 1
-      option anon_swap 1
-
-config mount
-      option target    /mnt/usb
-      option device    /dev/sda2
-      option fstype    ext4
-      option options   rw,async,noatime,nodiratime
-      option enabled   1
-      option enabled_fsck 0
-
-config swap
-      option device    /dev/sda1
-      option enabled   1
 
-EOF
+## ian: commented and replaced with just an echo
+## since usb port seems to be busted.
+echo | cedit /etc/config/fstab
+# cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
+# config global automount
+#       option from_fstab 1
+#       option anon_mount 1
+
+# config global autoswap
+#       option from_fstab 1
+#       option anon_swap 1
+
+# config mount
+#       option target  /mnt/usb
+#       option device  /dev/sda2
+#       option fstype  ext2
+#       option options rw,async,noatime,nodiratime
+#       option enabled 1
+#       option enabled_fsck 0
+
+# config swap
+#       option device  /dev/sda1
+#       option enabled 1
+
+# EOF
 
 
 
@@ -261,14 +265,15 @@ dnsmasq_restart=false
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 127.0.1.1 wrt
 192.168.1.1 wrt
-192.168.1.2 treetowl b8.nz faiserver
+192.168.1.2 treetowl
 192.168.1.3 frodo
 192.168.1.4 htpc
-192.168.1.5 x2
+192.168.1.5 x2 faiserver b8.nz
 192.168.1.6 demohost
 #192.168.1.7 faiserver
 192.168.1.8 tp
 192.168.1.9 n5
+192.168.1.10 kw
 72.14.176.105 li
 45.33.9.11 lj
 138.68.10.24 dopub
@@ -365,6 +370,7 @@ dhcp-host=c4:43:8f:f2:79:1f,set:n5,192.168.1.9,n5
 # 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,192.168.1.251,switch9429ca
+dhcp-host=10:78:d2:da:28:4f,set:kw,192.168.1.10,kw
 
 
 # template