misc init.d cleanups

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1123 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 68 insertions, 77 deletions

diff --git a/openwrt/target/default/target_skeleton/etc/init.d/S40network b/openwrt/target/default/target_skeleton/etc/init.d/S40network
index a8144a8375..d8b4e4125e 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/S40network
+++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/init.d/S45firewall b/openwrt/target/default/target_skeleton/etc/init.d/S45firewall
index 51c35b03a1..072f411a9f 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/S45firewall
+++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/init.d/S50dnsmasq b/openwrt/target/default/target_skeleton/etc/init.d/S50dnsmasq
index 55bbc37197..8e73b0eeec 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/S50dnsmasq
+++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/init.d/S50httpd b/openwrt/target/default/target_skeleton/etc/init.d/S50httpd
index fd66f8032f..9cf551e5c6 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/S50httpd
+++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/init.d/S50telnet b/openwrt/target/default/target_skeleton/etc/init.d/S50telnet
index 29af5040a3..599c3540eb 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/S50telnet
+++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/init.d/rcS b/openwrt/target/default/target_skeleton/etc/init.d/rcS
index eeed18b770..1242f5623d 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/rcS
+++ b/openwrt/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 ''
diff --git a/openwrt/target/default/target_skeleton/sbin/ifup b/openwrt/target/default/target_skeleton/sbin/ifup
index 60f9a17302..3748d76aca 100755
--- a/openwrt/target/default/target_skeleton/sbin/ifup
+++ b/openwrt/target/default/target_skeleton/sbin/ifup
@@ -1,63 +1,63 @@
 #!/bin/ash
 . /etc/functions.sh
-  type=$1
-  debug "### ifup $type ###"
-
-  if=$(nvram get ${type}_ifname)
-  if [ "${if%%[0-9]}" = "ppp" ]; then
-    if=$(nvram get pppoe_ifname)
-  fi
-
-  if_valid $if || return
-
-  mac=$(nvram get ${type}_hwaddr)
-  $DEBUG ifconfig $if down 2>&-
-  if [ "${if%%[0-9]}" = "br" ]; then
-    stp=$(nvram get ${type}_stp)
-    $DEBUG brctl delbr $if 2>&-
-    $DEBUG brctl addbr $if
-    $DEBUG brctl setfd $if 0
-    $DEBUG brctl stp $if ${stp:-0}
-    for sif in $(nvram get ${type}_ifnames); do {
-      if_valid $sif || continue
-      ${mac:+$DEBUG ifconfig $sif down hw ether $mac}
-      $DEBUG ifconfig $sif 0.0.0.0 up
-      $DEBUG brctl addif $if $sif
-    } done
-  else
-    ${mac:+$DEBUG ifconfig $if down hw ether $mac}
-  fi
-
-
-  if_proto=$(nvram get ${type}_proto)
-  case "$if_proto" in
-    static)
-      ip=$(nvram get ${type}_ipaddr)
-      netmask=$(nvram get ${type}_netmask)
-      gateway=$(nvram get ${type}_gateway)
-
-      $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
-      ${gateway:+$DEBUG route add default gw $gateway}
-
-      [ -f /etc/resolv.conf ] && return
-
-      debug "# --- creating /etc/resolv.conf ---"
-      for dns in $(nvram get ${type}_dns); do {
+type=$1
+debug "### ifup $type ###"
+
+if=$(nvram get ${type}_ifname)
+if [ "${if%%[0-9]}" = "ppp" ]; then
+  if=$(nvram get pppoe_ifname)
+fi
+
+if_valid $if || return
+
+mac=$(nvram get ${type}_hwaddr)
+$DEBUG ifconfig $if down 2>&-
+if [ "${if%%[0-9]}" = "br" ]; then
+  stp=$(nvram get ${type}_stp)
+  $DEBUG brctl delbr $if 2>&-
+  $DEBUG brctl addbr $if
+  $DEBUG brctl setfd $if 0
+  $DEBUG brctl stp $if ${stp:-0}
+  for sif in $(nvram get ${type}_ifnames); do {
+    if_valid $sif || continue
+    ${mac:+$DEBUG ifconfig $sif down hw ether $mac}
+    $DEBUG ifconfig $sif 0.0.0.0 up
+    $DEBUG brctl addif $if $sif
+  } done
+else
+  ${mac:+$DEBUG ifconfig $if down hw ether $mac}
+fi
+
+
+if_proto=$(nvram get ${type}_proto)
+case "$if_proto" in
+  static)
+    ip=$(nvram get ${type}_ipaddr)
+    netmask=$(nvram get ${type}_netmask)
+    gateway=$(nvram get ${type}_gateway)
+
+    $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
+    ${gateway:+$DEBUG route add default gw $gateway}
+
+    [ -f /etc/resolv.conf ] && return
+
+    debug "# --- creating /etc/resolv.conf ---"
+    for dns in $(nvram get ${type}_dns); do {
 	echo "nameserver $dns" >> /etc/resolv.conf
-      } done
-    ;;
-    dhcp)
-      ip=$(nvram get ${type}_ipaddr)
-      pidfile=/tmp/dhcp-${type}.pid
-      if [ -f $pidfile ]; then
-        $DEBUG kill $(cat $pidfile)
-      fi
-      ${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &" 
-    ;;
-    none|"")
-	# pppoe is handled by /etc/init.d/S50pppoe
-    ;;
-    *)
-      echo "### ifup $type: ignored ${type}_proto=\"$if_proto\" (not supported)"
-    ;;
-  esac
+    } done
+  ;;
+  dhcp)
+    ip=$(nvram get ${type}_ipaddr)
+    pidfile=/tmp/dhcp-${type}.pid
+    if [ -f $pidfile ]; then
+      $DEBUG kill $(cat $pidfile)
+    fi
+    ${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &" 
+  ;;
+  none|"")
+  ;;
+  *)
+    [ -x "/sbin/ifup.${if_proto}" ] && { $DEBUG /sbin/ifup.${if_proto} $*; exit; }
+    echo "### ifup $type: ignored ${type}_proto=\"$if_proto\" (not supported)"
+  ;;
+esac