summaryrefslogtreecommitdiffstats
path: root/target/default/target_skeleton/etc
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-30 23:46:18 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-30 23:46:18 +0000
commit6b885ae37f99662a5c9530b975a70c1bb54e85d3 (patch)
treeb12f4e23c7ab60e5f304445a8457142607010e19 /target/default/target_skeleton/etc
parentb45649226c12b6adb362ef9afbd70f1ae2df859d (diff)
misc init.d cleanups
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1123 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/default/target_skeleton/etc')
-rwxr-xr-xtarget/default/target_skeleton/etc/init.d/S40network1
-rwxr-xr-xtarget/default/target_skeleton/etc/init.d/S45firewall16
-rwxr-xr-xtarget/default/target_skeleton/etc/init.d/S50dnsmasq2
-rwxr-xr-xtarget/default/target_skeleton/etc/init.d/S50httpd2
-rwxr-xr-xtarget/default/target_skeleton/etc/init.d/S50telnet2
-rwxr-xr-xtarget/default/target_skeleton/etc/init.d/rcS2
6 files changed, 8 insertions, 17 deletions
diff --git a/target/default/target_skeleton/etc/init.d/S40network b/target/default/target_skeleton/etc/init.d/S40network
index a8144a837..d8b4e4125 100755
--- a/target/default/target_skeleton/etc/init.d/S40network
+++ b/target/default/target_skeleton/etc/init.d/S40network
@@ -1,5 +1,4 @@
#!/bin/sh
-. /etc/functions.sh
case "$1" in
start|restart)
ifup lan
diff --git a/target/default/target_skeleton/etc/init.d/S45firewall b/target/default/target_skeleton/etc/init.d/S45firewall
index 51c35b03a..072f411a9 100755
--- a/target/default/target_skeleton/etc/init.d/S45firewall
+++ b/target/default/target_skeleton/etc/init.d/S45firewall
@@ -1,5 +1,4 @@
#!/bin/sh
-${FAILSAFE:+return}
. /etc/functions.sh
WAN=$(nvram get wan_ifname)
LAN=$(nvram get lan_ifname)
@@ -17,18 +16,6 @@ iptables -N forwarding_rule
iptables -t nat -N prerouting_rule
iptables -t nat -N postrouting_rule
-### Allow SSH from WAN
-# iptables -t nat -A prerouting_rule -i $WAN -p tcp --dport 22 -j ACCEPT
-# iptables -A input_rule -i $WAN -p tcp --dport 22 -j ACCEPT
-
-### Port forwarding
-# iptables -t nat -A prerouting_rule -i $WAN -p tcp --dport 22 -j DNAT --to 192.168.1.2
-# iptables -A forwarding_rule -i $WAN -p tcp --dport 22 -d 192.168.1.2 -j ACCEPT
-
-### DMZ (should be placed after port forwarding / accept rules)
-# iptables -t nat -A prerouting_rule -i $WAN -j DNAT --to 192.168.1.2
-# iptables -A forwarding_rule -i $WAN -d 192.168.1.2 -j ACCEPT
-
### INPUT
### (connections with the router as destination)
@@ -94,3 +81,6 @@ iptables -t nat -N postrouting_rule
iptables -t nat -A PREROUTING -j prerouting_rule
iptables -t nat -A POSTROUTING -j postrouting_rule
iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE
+
+## USER RULES
+. /etc/firewall.user
diff --git a/target/default/target_skeleton/etc/init.d/S50dnsmasq b/target/default/target_skeleton/etc/init.d/S50dnsmasq
index 55bbc3719..8e73b0eee 100755
--- a/target/default/target_skeleton/etc/init.d/S50dnsmasq
+++ b/target/default/target_skeleton/etc/init.d/S50dnsmasq
@@ -22,4 +22,4 @@ udhcpc -n -q -R -s /dev/zero -i $ifname >&- || {
args="-K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h"
}
-/usr/sbin/dnsmasq ${args}
+dnsmasq ${args}
diff --git a/target/default/target_skeleton/etc/init.d/S50httpd b/target/default/target_skeleton/etc/init.d/S50httpd
index fd66f8032..9cf551e5c 100755
--- a/target/default/target_skeleton/etc/init.d/S50httpd
+++ b/target/default/target_skeleton/etc/init.d/S50httpd
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/sbin/httpd -p 80 -h /www -r WRT54G Router
+httpd -p 80 -h /www -r WRT54G Router
diff --git a/target/default/target_skeleton/etc/init.d/S50telnet b/target/default/target_skeleton/etc/init.d/S50telnet
index 29af5040a..599c3540e 100755
--- a/target/default/target_skeleton/etc/init.d/S50telnet
+++ b/target/default/target_skeleton/etc/init.d/S50telnet
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/sbin/telnetd -l /bin/login
+telnetd -l /bin/login
diff --git a/target/default/target_skeleton/etc/init.d/rcS b/target/default/target_skeleton/etc/init.d/rcS
index eeed18b77..1242f5623 100755
--- a/target/default/target_skeleton/etc/init.d/rcS
+++ b/target/default/target_skeleton/etc/init.d/rcS
@@ -1,6 +1,8 @@
#!/bin/sh
syslogd -C 16
klogd
+${FAILSAFE:+telnetd -l /bin/login; ifup lan; exit}
+
for i in /etc/init.d/S*; do
$i start 2>&1
done | logger -s -p 6 -t ''