small fix and config change

diff --git a/dsfull b/dsfull
index 51ecdda5013c6101e788d5f31383f4b900d4c691..e24c549fdf70818e8ee02a448c3778fafaa32f56 100755 (executable)
--- a/dsfull
+++ b/dsfull
@@ -25,7 +25,7 @@ fi
 
 set -x
 
-cleanup() { pxe-server :; }
+cleanup() { pxe-server; }
 pxe-server $host fai
 
 

diff --git a/pxe-server b/pxe-server
index 4e4aaa8262f0d80f229fe95aada34d025b15d109..66bc4ff4129da671c713082138ae091c40834e81 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -155,6 +155,7 @@ if $wait; then
     # bleh.
     echo "waiting for $acks dhcp acks then disabling pxe"
     ack-wait $acks
+    type=
     set-pxe
 
     # previously tried waiting for one more ack then disabling faiserver,

diff --git a/wrt-disabled-firewall-rules b/wrt-disabled-firewall-rules
index 3190f0b7775c33d32de2add34cd8c0cc8ff6b799..c126d432d33d1a441a4df69de52abf5ef4557ff5 100644 (file)
--- a/wrt-disabled-firewall-rules
+++ b/wrt-disabled-firewall-rules
@@ -6,29 +6,7 @@ firewall rules, temporarily disabled until I get them working
 
 
 #http/https
-config redirect
-       option src              wan
-       option src_dport        443
-       option dest             lan
-       option dest_ip          192.168.1.2
-       option proto            tcp
-config rule
-       option src              wan
-       option target           ACCEPT
-       option dest_port        443
-       option proto            tcp
 
-config redirect
-       option src              wan
-       option src_dport        80
-       option dest             lan
-       option dest_ip          192.168.1.2
-       option proto            tcp
-config rule
-       option src              wan
-       option target           ACCEPT
-       option dest_port        80
-       option proto            tcp
 
 
 config redirect

diff --git a/wrt-setup b/wrt-setup
index b8d62f256a4f43ac0284f723dc7c01aa8e53bcea..410c7a0a5b5e4cfa7ca636f4e9b59f1612bcc728 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -197,6 +197,29 @@ config rule
     option target           ACCEPT
     option dest_port        2222
 
+config redirect
+       option src              wan
+       option src_dport        443
+       option dest             lan
+       option dest_ip          192.168.1.2
+       option proto            tcp
+config rule
+       option src              wan
+       option target           ACCEPT
+       option dest_port        443
+       option proto            tcp
+
+config redirect
+       option src              wan
+       option src_dport        80
+       option dest             lan
+       option dest_ip          192.168.1.2
+       option proto            tcp
+config rule
+       option src              wan
+       option target           ACCEPT
+       option dest_port        80
+       option proto            tcp
 EOF