From 6a0c7478207d03871e433e554829e6157897f326 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 17 Jul 2005 22:52:59 +0000
Subject: move target/default/target_skeleton into package/base-files, put all
 the default files in ipkg packages, cleanup some junk in toolchain/,
 toolchain/ no longer changes build_mipsel/root

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1494 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/banner             |  6 ++
 package/base-files/default/etc/dnsmasq.conf       | 25 ++++++
 package/base-files/default/etc/firewall.user      | 27 +++++++
 package/base-files/default/etc/functions.sh       | 57 ++++++++++++++
 package/base-files/default/etc/group              |  2 +
 package/base-files/default/etc/hosts              |  1 +
 package/base-files/default/etc/init.d/S10boot     | 38 +++++++++
 package/base-files/default/etc/init.d/S40network  | 14 ++++
 package/base-files/default/etc/init.d/S45firewall | 92 ++++++++++++++++++++++
 package/base-files/default/etc/init.d/S50dnsmasq  | 27 +++++++
 package/base-files/default/etc/init.d/S50httpd    |  2 +
 package/base-files/default/etc/init.d/S50telnet   |  2 +
 package/base-files/default/etc/init.d/S99done     |  4 +
 package/base-files/default/etc/init.d/rcS         |  8 ++
 package/base-files/default/etc/inittab            |  3 +
 package/base-files/default/etc/ipkg.conf          |  3 +
 package/base-files/default/etc/modules            |  2 +
 package/base-files/default/etc/nvram.overrides    | 96 +++++++++++++++++++++++
 package/base-files/default/etc/passwd             |  2 +
 package/base-files/default/etc/preinit            | 17 ++++
 package/base-files/default/etc/profile            | 11 +++
 package/base-files/default/etc/protocols          | 56 +++++++++++++
 package/base-files/default/etc/shells             |  1 +
 package/base-files/default/etc/sysctl.conf        |  7 ++
 24 files changed, 503 insertions(+)
 create mode 100644 package/base-files/default/etc/banner
 create mode 100644 package/base-files/default/etc/dnsmasq.conf
 create mode 100755 package/base-files/default/etc/firewall.user
 create mode 100755 package/base-files/default/etc/functions.sh
 create mode 100644 package/base-files/default/etc/group
 create mode 100644 package/base-files/default/etc/hosts
 create mode 100755 package/base-files/default/etc/init.d/S10boot
 create mode 100755 package/base-files/default/etc/init.d/S40network
 create mode 100755 package/base-files/default/etc/init.d/S45firewall
 create mode 100755 package/base-files/default/etc/init.d/S50dnsmasq
 create mode 100755 package/base-files/default/etc/init.d/S50httpd
 create mode 100755 package/base-files/default/etc/init.d/S50telnet
 create mode 100755 package/base-files/default/etc/init.d/S99done
 create mode 100755 package/base-files/default/etc/init.d/rcS
 create mode 100644 package/base-files/default/etc/inittab
 create mode 100644 package/base-files/default/etc/ipkg.conf
 create mode 100644 package/base-files/default/etc/modules
 create mode 100644 package/base-files/default/etc/nvram.overrides
 create mode 100644 package/base-files/default/etc/passwd
 create mode 100755 package/base-files/default/etc/preinit
 create mode 100644 package/base-files/default/etc/profile
 create mode 100644 package/base-files/default/etc/protocols
 create mode 100644 package/base-files/default/etc/shells
 create mode 100644 package/base-files/default/etc/sysctl.conf

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/banner b/package/base-files/default/etc/banner
new file mode 100644
index 0000000000..2b2b2c015b
--- /dev/null
+++ b/package/base-files/default/etc/banner
@@ -0,0 +1,6 @@
+  _______                     ________        __
+ |       |.-----.-----.-----.|  |  |  |.----.|  |_
+ |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
+ |_______||   __|_____|__|__||________||__|  |____|
+          |__| W I R E L E S S   F R E E D O M
+          
diff --git a/package/base-files/default/etc/dnsmasq.conf b/package/base-files/default/etc/dnsmasq.conf
new file mode 100644
index 0000000000..4ef96803a6
--- /dev/null
+++ b/package/base-files/default/etc/dnsmasq.conf
@@ -0,0 +1,25 @@
+# filter what we send upstream
+domain-needed
+bogus-priv
+filterwin2k
+localise-queries
+
+# allow /etc/hosts and dhcp lookups via *.lan
+local=/lan/
+domain=lan
+
+# no dhcp / dns queries from the wan
+except-interface=vlan1
+
+# enable dhcp (start,end,netmask,leasetime)
+dhcp-authoritative
+#dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h
+#dhcp-leasefile=/tmp/dhcp.leases
+
+# use /etc/ethers for static hosts; same format as --dhcp-host
+# <hwaddr> [<hostname>] <ipaddr>
+read-ethers
+
+# other useful options:
+# default route(s): dhcp-option=3,192.168.1.1,192.168.1.2
+#    dns server(s): dhcp-option=6,192.168.1.1,192.168.1.2
diff --git a/package/base-files/default/etc/firewall.user b/package/base-files/default/etc/firewall.user
new file mode 100755
index 0000000000..1781bd4ea0
--- /dev/null
+++ b/package/base-files/default/etc/firewall.user
@@ -0,0 +1,27 @@
+#!/bin/sh
+. /etc/functions.sh
+
+WAN=$(nvram get wan_ifname)
+LAN=$(nvram get lan_ifname)
+
+iptables -F input_rule
+iptables -F output_rule
+iptables -F forwarding_rule
+iptables -t nat -F prerouting_rule
+iptables -t nat -F postrouting_rule
+
+### BIG FAT DISCLAIMER
+### The "-i $WAN" literally means packets that came in over the $WAN interface;
+### this WILL NOT MATCH packets sent from the LAN to the WAN address.
+
+### 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
diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
new file mode 100755
index 0000000000..60d6231f8a
--- /dev/null
+++ b/package/base-files/default/etc/functions.sh
@@ -0,0 +1,57 @@
+#!/bin/ash
+
+alias debug=${DEBUG:-:}
+
+# allow env to override nvram
+nvram () {
+  case $1 in
+    get) eval "echo \${NVRAM_$2:-\$(command nvram get $2)}";;
+    *) command nvram $*;;
+  esac
+}
+. /etc/nvram.overrides
+
+# valid interface?
+if_valid () (
+  ifconfig "$1" >&- 2>&- ||
+  [ "${1%%[0-9]}" = "br" ] ||
+  {
+    [ "${1%%[0-9]}" = "vlan" ] && ( 
+      i=${1#vlan}
+      hwname=$(nvram get vlan${i}hwname)
+      hwaddr=$(nvram get ${hwname}macaddr)
+      [ -z "$hwaddr" ] && return 1
+
+      vif=$(ifconfig -a | awk '/^eth.*'$hwaddr'/ {print $1; exit}' IGNORECASE=1)
+      debug "# vlan$i => $vif"
+
+      $DEBUG ifconfig $vif up
+      $DEBUG vconfig add $vif $i 2>&-
+    )
+  } ||
+  { debug "# missing interface '$1' ignored"; false; }
+)
+
+bitcount () {
+  local c=$1
+  echo $((
+  c=((c>> 1)&0x55555555)+(c&0x55555555),
+  c=((c>> 2)&0x33333333)+(c&0x33333333),
+  c=((c>> 4)&0x0f0f0f0f)+(c&0x0f0f0f0f),
+  c=((c>> 8)&0x00ff00ff)+(c&0x00ff00ff),
+  c=((c>>16)&0x0000ffff)+(c&0x0000ffff)
+  ))
+}
+
+valid_netmask () {
+  return $((-($1)&~$1))
+}
+
+ip2int () (
+  set $(echo $1 | tr '\.' ' ')
+  echo $(($1<<24|$2<<16|$3<<8|$4))
+)
+
+int2ip () {
+  echo $(($1>>24&255)).$(($1>>16&255)).$(($1>>8&255)).$(($1&255))
+}
diff --git a/package/base-files/default/etc/group b/package/base-files/default/etc/group
new file mode 100644
index 0000000000..c4e77f316a
--- /dev/null
+++ b/package/base-files/default/etc/group
@@ -0,0 +1,2 @@
+root:x:0:
+nogroup:x:65534:
diff --git a/package/base-files/default/etc/hosts b/package/base-files/default/etc/hosts
new file mode 100644
index 0000000000..ce138ec1e6
--- /dev/null
+++ b/package/base-files/default/etc/hosts
@@ -0,0 +1 @@
+127.0.0.1 localhost OpenWrt
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
new file mode 100755
index 0000000000..22096d5fbb
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -0,0 +1,38 @@
+#!/bin/sh
+echo "S" > /proc/jffs2_bbc
+
+mkdir -p /var/run
+mkdir -p /var/log
+touch /var/log/wtmp
+touch /var/log/lastlog
+
+[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && {
+  # if default wifi mac, set two higher than the lan mac
+  nvram set il0macaddr=$(nvram get et0macaddr|
+  awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
+}
+
+# set up the vlan*ports variables for the asus wl-500g deluxe
+# if they don't already exist 
+[  "$(nvram get boardtype)" = "bcm95365r" \
+-a "$(nvram get boardnum)" = "45" \
+-a -z "$(nvram get vlan0ports)$(nvram get vlan1ports)" ] && {
+	nvram set vlan0ports="1 2 3 4 5*"
+	nvram set vlan1ports="0 5"
+}
+
+sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
+
+ifconfig lo 127.0.0.1 up
+ifconfig eth0 promisc
+
+HOSTNAME=$(nvram get wan_hostname)
+HOSTNAME=${HOSTNAME%%.*}
+echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
+
+vconfig set_name_type VLAN_PLUS_VID_NO_PAD
+
+# automagically run firstboot
+[ -z "$FAILSAFE" ] && {
+	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
+}
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
new file mode 100755
index 0000000000..d8b4e4125e
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S40network
@@ -0,0 +1,14 @@
+#!/bin/sh
+case "$1" in
+  start|restart)
+    ifup lan
+    ifup wan
+    ifup wifi
+    wifi up
+
+    for route in $(nvram get static_route); do {
+      eval "set $(echo $route | sed 's/:/ /g')"
+      $DEBUG route add -net $1 netmask $2 gw $3 metric $4 dev $5
+    } done
+    ;;
+esac
diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
new file mode 100755
index 0000000000..8350ccbfef
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+## Please make changes in /etc/firewall.user
+
+. /etc/functions.sh
+WAN=$(nvram get wan_ifname)
+LAN=$(nvram get lan_ifname)
+
+## CLEAR TABLES
+for T in filter nat mangle; do
+  iptables -t $T -F
+  iptables -t $T -X
+done
+
+iptables -N input_rule
+iptables -N output_rule
+iptables -N forwarding_rule
+
+iptables -t nat -N prerouting_rule
+iptables -t nat -N postrouting_rule
+
+### INPUT
+###  (connections with the router as destination)
+
+  # base case
+  iptables -P INPUT DROP
+  iptables -A INPUT -m state --state INVALID -j DROP
+  iptables -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+  iptables -A INPUT -p tcp --tcp-flags SYN SYN --tcp-option \! 2 -j  DROP
+
+  #
+  # insert accept rule or to jump to new accept-check table here
+  #
+  iptables -A INPUT -j input_rule
+
+  # allow
+  iptables -A INPUT -i \! $WAN	-j ACCEPT	# allow from lan/wifi interfaces 
+  iptables -A INPUT -p icmp	-j ACCEPT	# allow ICMP
+  iptables -A INPUT -p gre	-j ACCEPT	# allow GRE
+
+  # reject (what to do with anything not allowed earlier)
+  iptables -A INPUT -p tcp -j REJECT --reject-with tcp-reset
+  iptables -A INPUT -j REJECT --reject-with icmp-port-unreachable
+
+### OUTPUT
+### (connections with the router as source)
+
+  # base case
+  iptables -P OUTPUT DROP
+  iptables -A OUTPUT -m state --state INVALID -j DROP
+  iptables -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+
+  #
+  # insert accept rule or to jump to new accept-check table here
+  #
+  iptables -A OUTPUT -j output_rule
+
+  # allow
+  iptables -A OUTPUT -j ACCEPT		#allow everything out
+
+  # reject (what to do with anything not allowed earlier)
+  iptables -A OUTPUT -p tcp -j REJECT --reject-with tcp-reset
+  iptables -A OUTPUT -j REJECT --reject-with icmp-port-unreachable
+
+### FORWARDING
+### (connections routed through the router)
+
+  # base case
+  iptables -P FORWARD DROP 
+  iptables -A FORWARD -m state --state INVALID -j DROP
+  iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+  iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+
+  #
+  # insert accept rule or to jump to new accept-check table here
+  #
+  iptables -A FORWARD -j forwarding_rule
+
+  # allow
+  iptables -A FORWARD -i br0 -o br0 -j ACCEPT
+  iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT
+
+  # reject (what to do with anything not allowed earlier)
+  # uses the default -P DROP
+
+### MASQ
+  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
+[ -f /etc/firewall.user ] && . /etc/firewall.user
diff --git a/package/base-files/default/etc/init.d/S50dnsmasq b/package/base-files/default/etc/init.d/S50dnsmasq
new file mode 100755
index 0000000000..6a5af0f05f
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S50dnsmasq
@@ -0,0 +1,27 @@
+#!/bin/sh
+. /etc/functions.sh
+
+# interface to use for DHCP
+iface=lan
+
+ifname=$(nvram get ${iface}_ifname)
+ipaddr=$(nvram get ${iface}_ipaddr)
+netmask=$(nvram get ${iface}_netmask)
+
+(
+	# check for existing DHCP server
+	udhcpc -n -q -R -s /dev/zero -i $ifname >&- || {
+
+	  ipaddr=$(ip2int $ipaddr)
+	  netmask=$(ip2int ${netmask:-255.255.255.0})
+	  network=$((ipaddr&netmask))
+	  
+	  start=$(nvram get dhcp_start)
+	  start=$((network+${start:-100}))
+	  end=$(nvram get dhcp_num)
+	  end=$((start+${end:-150}))
+	  
+	  args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h"
+	}
+	dnsmasq ${args}
+) &
diff --git a/package/base-files/default/etc/init.d/S50httpd b/package/base-files/default/etc/init.d/S50httpd
new file mode 100755
index 0000000000..9cf551e5c6
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S50httpd
@@ -0,0 +1,2 @@
+#!/bin/sh
+httpd -p 80 -h /www -r WRT54G Router
diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet
new file mode 100755
index 0000000000..599c3540eb
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S50telnet
@@ -0,0 +1,2 @@
+#!/bin/sh
+telnetd -l /bin/login
diff --git a/package/base-files/default/etc/init.d/S99done b/package/base-files/default/etc/init.d/S99done
new file mode 100755
index 0000000000..ce60337212
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S99done
@@ -0,0 +1,4 @@
+#!/bin/sh
+# set leds to normal state
+echo "0x00" > /proc/sys/diag
+sysctl -p >&-
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS
new file mode 100755
index 0000000000..e6daddc593
--- /dev/null
+++ b/package/base-files/default/etc/init.d/rcS
@@ -0,0 +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/package/base-files/default/etc/inittab b/package/base-files/default/etc/inittab
new file mode 100644
index 0000000000..aab2df9562
--- /dev/null
+++ b/package/base-files/default/etc/inittab
@@ -0,0 +1,3 @@
+::sysinit:/etc/init.d/rcS
+::shutdown:/sbin/halt
+tts/0::askfirst:/bin/ash --login
diff --git a/package/base-files/default/etc/ipkg.conf b/package/base-files/default/etc/ipkg.conf
new file mode 100644
index 0000000000..3867213313
--- /dev/null
+++ b/package/base-files/default/etc/ipkg.conf
@@ -0,0 +1,3 @@
+src experimental http://openwrt.org/downloads/experimental/bin/packages
+dest root /
+dest ram /tmp
diff --git a/package/base-files/default/etc/modules b/package/base-files/default/etc/modules
new file mode 100644
index 0000000000..e717eae577
--- /dev/null
+++ b/package/base-files/default/etc/modules
@@ -0,0 +1,2 @@
+et
+wl
diff --git a/package/base-files/default/etc/nvram.overrides b/package/base-files/default/etc/nvram.overrides
new file mode 100644
index 0000000000..d457af48ee
--- /dev/null
+++ b/package/base-files/default/etc/nvram.overrides
@@ -0,0 +1,96 @@
+# NVRAM overrides
+#
+# This file handles the NVRAM quirks of various hardware.
+# THIS FILE IS NOT A REPLACEMENT FOR NVRAM
+
+# Load sysconf defaults
+[ -f /etc/sysconf ] && . /etc/sysconf
+
+# linksys bug; remove when not using static configuration for lan
+NVRAM_lan_proto="static"
+
+remap () {
+  for type in lan wifi wan pppoe
+  do
+    for s in '' s
+    do
+      eval NVRAM_${type}_ifname$s=\"$(nvram get ${type}_ifname$s|sed s/$1/$2/g)\" 
+    done
+  done
+}
+
+# hacks for wrt54g 1.x hardware
+[  "$(nvram get boardnum)"  = "42" \
+-a "$(nvram get boardtype)" = "bcm94710dev" ] && {
+  debug "### wrt54g 1.x hack ###"
+  NVRAM_vlan1hwname="et0"
+  NVRAM_vlan2hwname="et0"
+  FAILSAFE_ifnames="vlan1 vlan2 eth2"
+  remap eth0 vlan2
+  remap eth1 vlan1
+}
+
+# hacks for asus wl-500g deluxe
+[  "$(nvram get boardtype)" = "bcm95365r" \
+-a "$(nvram get boardnum)" = "45" ] && {
+  debug "### wl-500g deluxe hacks ###"
+  NVRAM_vlan0hwname="et0"
+  NVRAM_vlan1hwname="et0"
+  FAILSAFE_ifnames="vlan0 eth1"
+  remap eth0.1 vlan0
+  remap eth0 vlan1
+}
+
+# hacks for asus wl-300g
+[ "$(nvram get productid)" = "WL300g" ] && {
+  debug "### wl-300g hacks ###"
+  NVRAM_lan_ifnames="eth0 eth2"
+  NVRAM_wan_ifname="none"
+}
+
+# hacks for wap54g hardware
+[  "$(nvram get boardnum)" = "2" \
+-o "$(nvram get boardnum)" = "1024" ] && {
+  debug "### wap54g hack ###"
+  NVRAM_wan_ifname="none"
+  FAILSAFE_ifnames="eth0 eth1"
+}
+
+# hacks for buffalo wla2-g54l
+[  "$(nvram get boardnum)" = "00" \
+-a "$(nvram get product_name)" = "Product_name" \
+-o "$(nvram get product_name)" = "WLA2-G54L" ] && {
+  debug "### wla2-g54l hacks ###"
+  NVRAM_wan_ifname="none"
+  NVRAM_lan_ifnames="vlan0"
+}
+
+# hack for asus wl-500g hardware
+[  "$(nvram get boardnum)"  = "asusX" \
+-a "$(nvram get boardtype)"  = "bcm94710dev" ] && {
+  FAILSAFE_ifnames="eth0 eth2"
+}
+
+# defaults if lan_ifname is missing
+[ -z "$(nvram get lan_ifname)" ] && {
+  NVRAM_lan_ifname="br0"
+  NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan2 eth1 eth2 eth3"}
+}
+
+# defaults if wan_ifname is missing
+[ -z "$(nvram get wan_ifname)" ] && {
+   NVRAM_wan_ifname="vlan1"
+   NVRAM_wan_proto="dhcp"
+}
+
+# failsafe if reset is held
+[ "$FAILSAFE" = "true" ] && {
+  echo "### YOU ARE IN FAILSAFE MODE ####"
+  NVRAM_lan_ifname="br0"
+  NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan1 eth1 eth2 eth3"}
+  NVRAM_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
+  NVRAM_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
+  NVRAM_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}
+  NVRAM_wan_ifname="none"
+  NVRAM_wifi_ifname="none"
+}
diff --git a/package/base-files/default/etc/passwd b/package/base-files/default/etc/passwd
new file mode 100644
index 0000000000..3b660a0d4e
--- /dev/null
+++ b/package/base-files/default/etc/passwd
@@ -0,0 +1,2 @@
+root:!:0:0:root:/tmp:/bin/ash
+nobody:*:65534:65534:nobody:/var:/bin/false
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
new file mode 100755
index 0000000000..0c59893f75
--- /dev/null
+++ b/package/base-files/default/etc/preinit
@@ -0,0 +1,17 @@
+#!/bin/sh
+mount none /proc -t proc
+insmod diag
+echo 0x01 > /proc/sys/diag
+sleep 1
+if [ $(cat /proc/sys/reset) = 1 ] || [ "$(/usr/sbin/nvram get failsafe)" = 1 ]; then
+	export FAILSAFE=true
+	[ "$(/usr/sbin/nvram get boot_wait)" != "on" ] && {
+		/usr/sbin/nvram set boot_wait=on
+		/usr/sbin/nvram commit
+	}
+	while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
+fi
+
+/sbin/mount_root ${FAILSAFE:+failsafe}
+
+exec /sbin/init
diff --git a/package/base-files/default/etc/profile b/package/base-files/default/etc/profile
new file mode 100644
index 0000000000..1d98ae3402
--- /dev/null
+++ b/package/base-files/default/etc/profile
@@ -0,0 +1,11 @@
+#!/bin/sh
+[ -f /etc/banner ] && cat /etc/banner
+
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PS1='\u@\h:\w\$ '
+
+[ -x /usr/bin/less ] || alias less=more
+alias vim=vi
+
+arp() { cat /proc/net/arp; }
+ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
diff --git a/package/base-files/default/etc/protocols b/package/base-files/default/etc/protocols
new file mode 100644
index 0000000000..53fecb6d3c
--- /dev/null
+++ b/package/base-files/default/etc/protocols
@@ -0,0 +1,56 @@
+# Internet (IP) protocols
+#
+# Updated from http://www.iana.org/assignments/protocol-numbers and other
+# sources.
+# New protocols will be added on request if they have been officially
+# assigned by IANA and are not historical.
+# If you need a huge list of used numbers please install the nmap package.
+
+ip	0	IP		# internet protocol, pseudo protocol number
+#hopopt	0	HOPOPT		# IPv6 Hop-by-Hop Option [RFC1883]
+icmp	1	ICMP		# internet control message protocol
+igmp	2	IGMP		# Internet Group Management
+ggp	3	GGP		# gateway-gateway protocol
+ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
+st	5	ST		# ST datagram mode
+tcp	6	TCP		# transmission control protocol
+egp	8	EGP		# exterior gateway protocol
+igp	9	IGP		# any private interior gateway (Cisco)
+pup	12	PUP		# PARC universal packet protocol
+udp	17	UDP		# user datagram protocol
+hmp	20	HMP		# host monitoring protocol
+xns-idp	22	XNS-IDP		# Xerox NS IDP
+rdp	27	RDP		# "reliable datagram" protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4 [RFC905]
+xtp	36	XTP		# Xpress Transfer Protocol
+ddp	37	DDP		# Datagram Delivery Protocol
+idpr-cmtp 38	IDPR-CMTP	# IDPR Control Message Transport
+ipv6	41	IPv6		# Internet Protocol, version 6
+ipv6-route 43	IPv6-Route	# Routing Header for IPv6
+ipv6-frag 44	IPv6-Frag	# Fragment Header for IPv6
+idrp	45	IDRP		# Inter-Domain Routing Protocol
+rsvp	46	RSVP		# Reservation Protocol
+gre	47	GRE		# General Routing Encapsulation
+esp	50	IPSEC-ESP	# Encap Security Payload [RFC2046]
+ah	51	IPSEC-AH	# Authentication Header [RFC2402]
+skip	57	SKIP		# SKIP
+ipv6-icmp 58	IPv6-ICMP	# ICMP for IPv6
+ipv6-nonxt 59	IPv6-NoNxt	# No Next Header for IPv6
+ipv6-opts 60	IPv6-Opts	# Destination Options for IPv6
+rspf	73	RSPF CPHB	# Radio Shortest Path First (officially CPHB)
+vmtp	81	VMTP		# Versatile Message Transport
+eigrp	88	EIGRP		# Enhanced Interior Routing Protocol (Cisco)
+ospf	89	OSPFIGP		# Open Shortest Path First IGP
+ax.25	93	AX.25		# AX.25 frames
+ipip	94	IPIP		# IP-within-IP Encapsulation Protocol
+etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation [RFC3378]
+encap	98	ENCAP		# Yet Another IP encapsulation [RFC1241]
+#	99			# any private encryption scheme
+pim	103	PIM		# Protocol Independent Multicast
+ipcomp	108	IPCOMP		# IP Payload Compression Protocol
+vrrp	112	VRRP		# Virtual Router Redundancy Protocol
+l2tp	115	L2TP		# Layer Two Tunneling Protocol [RFC2661]
+isis	124	ISIS		# IS-IS over IPv4
+sctp	132	SCTP		# Stream Control Transmission Protocol
+fc	133	FC		# Fibre Channel
+
diff --git a/package/base-files/default/etc/shells b/package/base-files/default/etc/shells
new file mode 100644
index 0000000000..006aa38ced
--- /dev/null
+++ b/package/base-files/default/etc/shells
@@ -0,0 +1 @@
+/bin/ash
diff --git a/package/base-files/default/etc/sysctl.conf b/package/base-files/default/etc/sysctl.conf
new file mode 100644
index 0000000000..2050b0c886
--- /dev/null
+++ b/package/base-files/default/etc/sysctl.conf
@@ -0,0 +1,7 @@
+kernel.panic=3
+net.ipv4.ip_forward=1
+net.ipv4.icmp_echo_ignore_broadcasts=1
+net.ipv4.icmp_ignore_bogus_error_responses=1
+net.ipv4.tcp_fin_timeout=30
+net.ipv4.tcp_keepalive_time=120
+net.ipv4.tcp_timestamps=0
-- 
cgit v1.2.3


From 3954f5bb6270b5b7291fbd4c09c4f8e6c88c5f42 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Wed, 20 Jul 2005 19:58:40 +0000
Subject: updates from whiterussian

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1504 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/firewall.user      |  2 +-
 package/base-files/default/etc/init.d/S10boot     |  5 +++--
 package/base-files/default/etc/init.d/S45firewall |  1 +
 package/base-files/default/etc/init.d/rcS         |  7 ++++---
 package/base-files/default/etc/preinit            | 11 ++++++-----
 5 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/firewall.user b/package/base-files/default/etc/firewall.user
index 1781bd4ea0..7a13141623 100755
--- a/package/base-files/default/etc/firewall.user
+++ b/package/base-files/default/etc/firewall.user
@@ -14,7 +14,7 @@ iptables -t nat -F postrouting_rule
 ### The "-i $WAN" literally means packets that came in over the $WAN interface;
 ### this WILL NOT MATCH packets sent from the LAN to the WAN address.
 
-### Allow SSH from WAN
+### Allow SSH on the WAN interface
 # 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
 
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 22096d5fbb..ead73521b1 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -16,7 +16,8 @@ touch /var/log/lastlog
 # if they don't already exist 
 [  "$(nvram get boardtype)" = "bcm95365r" \
 -a "$(nvram get boardnum)" = "45" \
--a -z "$(nvram get vlan0ports)$(nvram get vlan1ports)" ] && {
+-a -z "$(nvram get vlan0ports)"
+-a -z "$(nvram get vlan1ports)" ] && {
 	nvram set vlan0ports="1 2 3 4 5*"
 	nvram set vlan1ports="0 5"
 }
@@ -33,6 +34,6 @@ echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 
 # automagically run firstboot
-[ -z "$FAILSAFE" ] && {
+[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
 	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
 }
diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 8350ccbfef..cb779792d5 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 ## Please make changes in /etc/firewall.user
+${FAILSAFE:+exit}
 
 . /etc/functions.sh
 WAN=$(nvram get wan_ifname)
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS
index e6daddc593..706585801c 100755
--- a/package/base-files/default/etc/init.d/rcS
+++ b/package/base-files/default/etc/init.d/rcS
@@ -1,8 +1,9 @@
 #!/bin/sh
-syslogd -C 16
+syslog_ip=$(nvram get log_ipaddr)
+ipcalc -s "$syslog_ip" || syslog_ip=""
+syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
 klogd
-${FAILSAFE:+telnetd -l /bin/login; ifup lan; exit}
-
+#${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/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index 0c59893f75..b23f8833ef 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -1,17 +1,18 @@
 #!/bin/sh
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
 insmod diag
 echo 0x01 > /proc/sys/diag
 sleep 1
-if [ $(cat /proc/sys/reset) = 1 ] || [ "$(/usr/sbin/nvram get failsafe)" = 1 ]; then
+if [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
 	export FAILSAFE=true
-	[ "$(/usr/sbin/nvram get boot_wait)" != "on" ] && {
-		/usr/sbin/nvram set boot_wait=on
-		/usr/sbin/nvram commit
+	[ "$(nvram get boot_wait)" != "on" ] && {
+		nvram set boot_wait=on
+		nvram commit
 	}
 	while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
 fi
 
-/sbin/mount_root ${FAILSAFE:+failsafe}
+mount_root ${FAILSAFE:+failsafe}
 
 exec /sbin/init
-- 
cgit v1.2.3


From 2afc4e3e6663473610d0f46c9bae925ee2bd251d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 21 Jul 2005 14:02:53 +0000
Subject: add config file /etc/config/network, add board-specific
 network.overrides (instead of nvram.overrides)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1519 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/config/network     |  9 +++
 package/base-files/default/etc/functions.sh       | 16 ++--
 package/base-files/default/etc/init.d/S10boot     | 30 +++----
 package/base-files/default/etc/init.d/S40network  |  1 +
 package/base-files/default/etc/init.d/S45firewall |  2 +
 package/base-files/default/etc/init.d/S50dnsmasq  |  2 +
 package/base-files/default/etc/nvram.overrides    | 96 -----------------------
 7 files changed, 41 insertions(+), 115 deletions(-)
 create mode 100644 package/base-files/default/etc/config/network
 delete mode 100644 package/base-files/default/etc/nvram.overrides

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/config/network b/package/base-files/default/etc/config/network
new file mode 100644
index 0000000000..049460160a
--- /dev/null
+++ b/package/base-files/default/etc/config/network
@@ -0,0 +1,9 @@
+# Network configuration file
+
+# Uncomment the following statements to override the default or nvram config
+# lan_ifame="br0"
+# lan_proto="static"
+# lan_ipaddr="192.168.1.1"
+# lan_netmask="255.255.255.0"
+# lan_gateway=""
+# lan_dns=""
diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 60d6231f8a..14f5011db7 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -4,12 +4,18 @@ alias debug=${DEBUG:-:}
 
 # allow env to override nvram
 nvram () {
-  case $1 in
-    get) eval "echo \${NVRAM_$2:-\$(command nvram get $2)}";;
-    *) command nvram $*;;
-  esac
+  if [ -x /usr/sbin/nvram ]; then
+    case $1 in
+      get) eval "echo \${$2:-\$(command nvram get $2)}";;
+      *) command nvram $*;;
+    esac
+  else
+    case $1 in
+      get) eval "echo \${$2:-\${DEFAULT_$2}}";;
+      *);;
+    esac
+  fi  
 }
-. /etc/nvram.overrides
 
 # valid interface?
 if_valid () (
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index ead73521b1..d45f8e809b 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -6,20 +6,22 @@ mkdir -p /var/log
 touch /var/log/wtmp
 touch /var/log/lastlog
 
-[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && {
-  # if default wifi mac, set two higher than the lan mac
-  nvram set il0macaddr=$(nvram get et0macaddr|
-  awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
-}
-
-# set up the vlan*ports variables for the asus wl-500g deluxe
-# if they don't already exist 
-[  "$(nvram get boardtype)" = "bcm95365r" \
--a "$(nvram get boardnum)" = "45" \
--a -z "$(nvram get vlan0ports)"
--a -z "$(nvram get vlan1ports)" ] && {
-	nvram set vlan0ports="1 2 3 4 5*"
-	nvram set vlan1ports="0 5"
+[ -x /usr/sbin/nvram ] && {
+  [ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && {
+    # if default wifi mac, set two higher than the lan mac
+    nvram set il0macaddr=$(nvram get et0macaddr|
+    awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
+  }
+
+  # set up the vlan*ports variables for the asus wl-500g deluxe
+  # if they don't already exist 
+  [  "$(nvram get boardtype)" = "bcm95365r" \
+  -a "$(nvram get boardnum)" = "45" \
+  -a -z "$(nvram get vlan0ports)"
+  -a -z "$(nvram get vlan1ports)" ] && {
+  	nvram set vlan0ports="1 2 3 4 5*"
+  	nvram set vlan1ports="0 5"
+  }
 }
 
 sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index d8b4e4125e..a5afe5266f 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -1,4 +1,5 @@
 #!/bin/sh
+[ -e /etc/config/network] && . /etc/config/network
 case "$1" in
   start|restart)
     ifup lan
diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index cb779792d5..188b9aaa8a 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -4,6 +4,8 @@
 ${FAILSAFE:+exit}
 
 . /etc/functions.sh
+. /etc/network.overrides
+[ -e /etc/config/network] && . /etc/config/network
 WAN=$(nvram get wan_ifname)
 LAN=$(nvram get lan_ifname)
 
diff --git a/package/base-files/default/etc/init.d/S50dnsmasq b/package/base-files/default/etc/init.d/S50dnsmasq
index 6a5af0f05f..31d0a36976 100755
--- a/package/base-files/default/etc/init.d/S50dnsmasq
+++ b/package/base-files/default/etc/init.d/S50dnsmasq
@@ -1,5 +1,7 @@
 #!/bin/sh
 . /etc/functions.sh
+. /etc/network.overrides
+[ -e /etc/config/network] && . /etc/config/network
 
 # interface to use for DHCP
 iface=lan
diff --git a/package/base-files/default/etc/nvram.overrides b/package/base-files/default/etc/nvram.overrides
deleted file mode 100644
index d457af48ee..0000000000
--- a/package/base-files/default/etc/nvram.overrides
+++ /dev/null
@@ -1,96 +0,0 @@
-# NVRAM overrides
-#
-# This file handles the NVRAM quirks of various hardware.
-# THIS FILE IS NOT A REPLACEMENT FOR NVRAM
-
-# Load sysconf defaults
-[ -f /etc/sysconf ] && . /etc/sysconf
-
-# linksys bug; remove when not using static configuration for lan
-NVRAM_lan_proto="static"
-
-remap () {
-  for type in lan wifi wan pppoe
-  do
-    for s in '' s
-    do
-      eval NVRAM_${type}_ifname$s=\"$(nvram get ${type}_ifname$s|sed s/$1/$2/g)\" 
-    done
-  done
-}
-
-# hacks for wrt54g 1.x hardware
-[  "$(nvram get boardnum)"  = "42" \
--a "$(nvram get boardtype)" = "bcm94710dev" ] && {
-  debug "### wrt54g 1.x hack ###"
-  NVRAM_vlan1hwname="et0"
-  NVRAM_vlan2hwname="et0"
-  FAILSAFE_ifnames="vlan1 vlan2 eth2"
-  remap eth0 vlan2
-  remap eth1 vlan1
-}
-
-# hacks for asus wl-500g deluxe
-[  "$(nvram get boardtype)" = "bcm95365r" \
--a "$(nvram get boardnum)" = "45" ] && {
-  debug "### wl-500g deluxe hacks ###"
-  NVRAM_vlan0hwname="et0"
-  NVRAM_vlan1hwname="et0"
-  FAILSAFE_ifnames="vlan0 eth1"
-  remap eth0.1 vlan0
-  remap eth0 vlan1
-}
-
-# hacks for asus wl-300g
-[ "$(nvram get productid)" = "WL300g" ] && {
-  debug "### wl-300g hacks ###"
-  NVRAM_lan_ifnames="eth0 eth2"
-  NVRAM_wan_ifname="none"
-}
-
-# hacks for wap54g hardware
-[  "$(nvram get boardnum)" = "2" \
--o "$(nvram get boardnum)" = "1024" ] && {
-  debug "### wap54g hack ###"
-  NVRAM_wan_ifname="none"
-  FAILSAFE_ifnames="eth0 eth1"
-}
-
-# hacks for buffalo wla2-g54l
-[  "$(nvram get boardnum)" = "00" \
--a "$(nvram get product_name)" = "Product_name" \
--o "$(nvram get product_name)" = "WLA2-G54L" ] && {
-  debug "### wla2-g54l hacks ###"
-  NVRAM_wan_ifname="none"
-  NVRAM_lan_ifnames="vlan0"
-}
-
-# hack for asus wl-500g hardware
-[  "$(nvram get boardnum)"  = "asusX" \
--a "$(nvram get boardtype)"  = "bcm94710dev" ] && {
-  FAILSAFE_ifnames="eth0 eth2"
-}
-
-# defaults if lan_ifname is missing
-[ -z "$(nvram get lan_ifname)" ] && {
-  NVRAM_lan_ifname="br0"
-  NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan2 eth1 eth2 eth3"}
-}
-
-# defaults if wan_ifname is missing
-[ -z "$(nvram get wan_ifname)" ] && {
-   NVRAM_wan_ifname="vlan1"
-   NVRAM_wan_proto="dhcp"
-}
-
-# failsafe if reset is held
-[ "$FAILSAFE" = "true" ] && {
-  echo "### YOU ARE IN FAILSAFE MODE ####"
-  NVRAM_lan_ifname="br0"
-  NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan1 eth1 eth2 eth3"}
-  NVRAM_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
-  NVRAM_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
-  NVRAM_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}
-  NVRAM_wan_ifname="none"
-  NVRAM_wifi_ifname="none"
-}
-- 
cgit v1.2.3


From 3dd35c309f63ee7906b23ae7453d771bfb59886c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 21 Jul 2005 16:57:12 +0000
Subject: fix firewall script, add ar7 network if into the bridge by default

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1522 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S45firewall | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 188b9aaa8a..c9986011ad 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -5,7 +5,8 @@ ${FAILSAFE:+exit}
 
 . /etc/functions.sh
 . /etc/network.overrides
-[ -e /etc/config/network] && . /etc/config/network
+[ -e /etc/config/network ] && . /etc/config/network
+
 WAN=$(nvram get wan_ifname)
 LAN=$(nvram get lan_ifname)
 
@@ -37,7 +38,7 @@ iptables -t nat -N postrouting_rule
   iptables -A INPUT -j input_rule
 
   # allow
-  iptables -A INPUT -i \! $WAN	-j ACCEPT	# allow from lan/wifi interfaces 
+  iptables -A INPUT ${WAN:+-i \! $WAN}	-j ACCEPT	# allow from lan/wifi interfaces 
   iptables -A INPUT -p icmp	-j ACCEPT	# allow ICMP
   iptables -A INPUT -p gre	-j ACCEPT	# allow GRE
 
@@ -81,7 +82,7 @@ iptables -t nat -N postrouting_rule
 
   # allow
   iptables -A FORWARD -i br0 -o br0 -j ACCEPT
-  iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT
+  [ -z "$WAN" ] || iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT
 
   # reject (what to do with anything not allowed earlier)
   # uses the default -P DROP
@@ -89,7 +90,7 @@ iptables -t nat -N postrouting_rule
 ### MASQ
   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
+  [ -z "$WAN" ] || iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE
 
 ## USER RULES
 [ -f /etc/firewall.user ] && . /etc/firewall.user
-- 
cgit v1.2.3


From 45324e807d14432748b746505180db948b570c26 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 25 Jul 2005 10:29:38 +0000
Subject: remove default /etc/modules file (gets installed by the kernel ipkg
 file instead)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1560 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/modules | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 package/base-files/default/etc/modules

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/modules b/package/base-files/default/etc/modules
deleted file mode 100644
index e717eae577..0000000000
--- a/package/base-files/default/etc/modules
+++ /dev/null
@@ -1,2 +0,0 @@
-et
-wl
-- 
cgit v1.2.3


From ec4b43d6caed9f22ca6ecd7312fea29c8abafaae Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 14 Aug 2005 13:33:12 +0000
Subject: fix typo

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1660 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index d45f8e809b..37eb7b3cc7 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -17,7 +17,7 @@ touch /var/log/lastlog
   # if they don't already exist 
   [  "$(nvram get boardtype)" = "bcm95365r" \
   -a "$(nvram get boardnum)" = "45" \
-  -a -z "$(nvram get vlan0ports)"
+  -a -z "$(nvram get vlan0ports)" \
   -a -z "$(nvram get vlan1ports)" ] && {
   	nvram set vlan0ports="1 2 3 4 5*"
   	nvram set vlan1ports="0 5"
-- 
cgit v1.2.3


From 53a7206209f655f97aa06f38d5c8d6504746533c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 23 Aug 2005 13:31:44 +0000
Subject: fix typo in S40network

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1735 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S40network | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index a5afe5266f..c4226d3437 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -1,5 +1,6 @@
 #!/bin/sh
-[ -e /etc/config/network] && . /etc/config/network
+. /etc/functions.sh
+[ -e /etc/config/network ] && . /etc/config/network
 case "$1" in
   start|restart)
     ifup lan
-- 
cgit v1.2.3


From e07a9f98817edcc4fd988ea72584474c3395c7e6 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 25 Aug 2005 11:57:56 +0000
Subject: don't load config files in failsafe mode

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1750 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S40network  | 2 +-
 package/base-files/default/etc/init.d/S45firewall | 2 +-
 package/base-files/default/etc/init.d/S50dnsmasq  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index c4226d3437..df7c6b3515 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -1,6 +1,6 @@
 #!/bin/sh
 . /etc/functions.sh
-[ -e /etc/config/network ] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 case "$1" in
   start|restart)
     ifup lan
diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index c9986011ad..066bded5bf 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -5,7 +5,7 @@ ${FAILSAFE:+exit}
 
 . /etc/functions.sh
 . /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
 WAN=$(nvram get wan_ifname)
 LAN=$(nvram get lan_ifname)
diff --git a/package/base-files/default/etc/init.d/S50dnsmasq b/package/base-files/default/etc/init.d/S50dnsmasq
index 31d0a36976..cce957573c 100755
--- a/package/base-files/default/etc/init.d/S50dnsmasq
+++ b/package/base-files/default/etc/init.d/S50dnsmasq
@@ -1,7 +1,7 @@
 #!/bin/sh
 . /etc/functions.sh
 . /etc/network.overrides
-[ -e /etc/config/network] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
 # interface to use for DHCP
 iface=lan
-- 
cgit v1.2.3


From 7dd7852ba2d9ab29c610461ed61c2428c34e8759 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 26 Aug 2005 15:52:12 +0000
Subject: clean up board-dependent files, add pppoatm support, add proper
 config examples

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1754 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/config/network | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 package/base-files/default/etc/config/network

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/config/network b/package/base-files/default/etc/config/network
deleted file mode 100644
index 049460160a..0000000000
--- a/package/base-files/default/etc/config/network
+++ /dev/null
@@ -1,9 +0,0 @@
-# Network configuration file
-
-# Uncomment the following statements to override the default or nvram config
-# lan_ifame="br0"
-# lan_proto="static"
-# lan_ipaddr="192.168.1.1"
-# lan_netmask="255.255.255.0"
-# lan_gateway=""
-# lan_dns=""
-- 
cgit v1.2.3


From 3bd4de0035a43df71a3dfdd0524b479deba4c617 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 7 Sep 2005 11:34:35 +0000
Subject: remove dnsmasq config files from base-files

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1867 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/dnsmasq.conf      | 25 --------------------
 package/base-files/default/etc/init.d/S50dnsmasq | 29 ------------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 package/base-files/default/etc/dnsmasq.conf
 delete mode 100755 package/base-files/default/etc/init.d/S50dnsmasq

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/dnsmasq.conf b/package/base-files/default/etc/dnsmasq.conf
deleted file mode 100644
index 4ef96803a6..0000000000
--- a/package/base-files/default/etc/dnsmasq.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# filter what we send upstream
-domain-needed
-bogus-priv
-filterwin2k
-localise-queries
-
-# allow /etc/hosts and dhcp lookups via *.lan
-local=/lan/
-domain=lan
-
-# no dhcp / dns queries from the wan
-except-interface=vlan1
-
-# enable dhcp (start,end,netmask,leasetime)
-dhcp-authoritative
-#dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h
-#dhcp-leasefile=/tmp/dhcp.leases
-
-# use /etc/ethers for static hosts; same format as --dhcp-host
-# <hwaddr> [<hostname>] <ipaddr>
-read-ethers
-
-# other useful options:
-# default route(s): dhcp-option=3,192.168.1.1,192.168.1.2
-#    dns server(s): dhcp-option=6,192.168.1.1,192.168.1.2
diff --git a/package/base-files/default/etc/init.d/S50dnsmasq b/package/base-files/default/etc/init.d/S50dnsmasq
deleted file mode 100755
index cce957573c..0000000000
--- a/package/base-files/default/etc/init.d/S50dnsmasq
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-. /etc/functions.sh
-. /etc/network.overrides
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
-
-# interface to use for DHCP
-iface=lan
-
-ifname=$(nvram get ${iface}_ifname)
-ipaddr=$(nvram get ${iface}_ipaddr)
-netmask=$(nvram get ${iface}_netmask)
-
-(
-	# check for existing DHCP server
-	udhcpc -n -q -R -s /dev/zero -i $ifname >&- || {
-
-	  ipaddr=$(ip2int $ipaddr)
-	  netmask=$(ip2int ${netmask:-255.255.255.0})
-	  network=$((ipaddr&netmask))
-	  
-	  start=$(nvram get dhcp_start)
-	  start=$((network+${start:-100}))
-	  end=$(nvram get dhcp_num)
-	  end=$((start+${end:-150}))
-	  
-	  args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h"
-	}
-	dnsmasq ${args}
-) &
-- 
cgit v1.2.3


From 7e193e707ffede27a21e66c78cf612fb33516e8e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Sat, 10 Sep 2005 15:44:58 +0000
Subject: ash on second tty for netgear wgt634u

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1884 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/inittab | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/inittab b/package/base-files/default/etc/inittab
index aab2df9562..3cbbe5af27 100644
--- a/package/base-files/default/etc/inittab
+++ b/package/base-files/default/etc/inittab
@@ -1,3 +1,4 @@
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/sbin/halt
 tts/0::askfirst:/bin/ash --login
+tts/1::askfirst:/bin/ash --login
-- 
cgit v1.2.3


From 7d821c627958b47e224e8b42f1b8ff2a039e7833 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Sat, 10 Sep 2005 18:28:33 +0000
Subject: add nvram.sh to all startup scripts, no errors on wgt634u

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1892 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh   | 16 +---------------
 package/base-files/default/etc/init.d/S10boot |  5 ++++-
 package/base-files/default/etc/init.d/rcS     |  1 +
 package/base-files/default/etc/nvram.sh       | 17 +++++++++++++++++
 package/base-files/default/etc/preinit        |  1 +
 5 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 package/base-files/default/etc/nvram.sh

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 14f5011db7..c813e39a61 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,22 +1,8 @@
 #!/bin/ash
+. /etc/nvram.sh
 
 alias debug=${DEBUG:-:}
 
-# allow env to override nvram
-nvram () {
-  if [ -x /usr/sbin/nvram ]; then
-    case $1 in
-      get) eval "echo \${$2:-\$(command nvram get $2)}";;
-      *) command nvram $*;;
-    esac
-  else
-    case $1 in
-      get) eval "echo \${$2:-\${DEFAULT_$2}}";;
-      *);;
-    esac
-  fi  
-}
-
 # valid interface?
 if_valid () (
   ifconfig "$1" >&- 2>&- ||
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 37eb7b3cc7..3ec41b1190 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,5 +1,8 @@
 #!/bin/sh
-echo "S" > /proc/jffs2_bbc
+. /etc/nvram.sh
+if [ "$(uname -r|grep 2.4)" = "0" ];do
+	echo "S" > /proc/jffs2_bbc
+done
 
 mkdir -p /var/run
 mkdir -p /var/log
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS
index 706585801c..10079c5932 100755
--- a/package/base-files/default/etc/init.d/rcS
+++ b/package/base-files/default/etc/init.d/rcS
@@ -1,4 +1,5 @@
 #!/bin/sh
+. /etc/nvram.sh
 syslog_ip=$(nvram get log_ipaddr)
 ipcalc -s "$syslog_ip" || syslog_ip=""
 syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
diff --git a/package/base-files/default/etc/nvram.sh b/package/base-files/default/etc/nvram.sh
new file mode 100644
index 0000000000..f1170ac470
--- /dev/null
+++ b/package/base-files/default/etc/nvram.sh
@@ -0,0 +1,17 @@
+#!/bin/ash
+
+# allow env to override nvram
+nvram () {
+  if [ -x /usr/sbin/nvram ]; then
+    case $1 in
+      get) eval "echo \${$2:-\$(command nvram get $2)}";;
+      *) command nvram $*;;
+    esac
+  else
+    case $1 in
+      get) eval "echo \${$2:-\${DEFAULT_$2}}";;
+      *);;
+    esac
+  fi  
+}
+
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index b23f8833ef..34de88c602 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -1,4 +1,5 @@
 #!/bin/sh
+. /etc/nvram.sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
 insmod diag
-- 
cgit v1.2.3


From 06c36e13b09a9cfade5b1ecdf523a342f4e370aa Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Sat, 10 Sep 2005 20:51:36 +0000
Subject: fix stupid error from me

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1894 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 3ec41b1190..a827391fe4 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,8 +1,8 @@
 #!/bin/sh
 . /etc/nvram.sh
-if [ "$(uname -r|grep 2.4)" = "0" ];do
+if [ "$(uname -r|grep 2.4)" = "0" ];then
 	echo "S" > /proc/jffs2_bbc
-done
+fi
 
 mkdir -p /var/run
 mkdir -p /var/log
-- 
cgit v1.2.3


From 5eff6029f8248575109200709f028a22cdd01c85 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Sun, 11 Sep 2005 16:52:05 +0000
Subject: add two words, so i see it is cvs head

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1906 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/banner | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/banner b/package/base-files/default/etc/banner
index 2b2b2c015b..310a743513 100644
--- a/package/base-files/default/etc/banner
+++ b/package/base-files/default/etc/banner
@@ -4,3 +4,4 @@
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
           
+	  cutting edge
-- 
cgit v1.2.3


From e5248a2a7f4bf589950f1f118ac1077f6cefd8a4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Fri, 16 Sep 2005 19:10:44 +0000
Subject: add robocfg to startup if kernel 2.6, fix jffs2 compression for 2.4

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1936 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index a827391fe4..66fece1d73 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,8 +1,9 @@
 #!/bin/sh
 . /etc/nvram.sh
-if [ "$(uname -r|grep 2.4)" = "0" ];then
-	echo "S" > /proc/jffs2_bbc
-fi
+
+[ "$(uname -r|grep -c 2.4)" = "1" ] && {
+        echo "S" > /proc/jffs2_bbc
+}
 
 mkdir -p /var/run
 mkdir -p /var/log
@@ -32,6 +33,11 @@ sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
 ifconfig lo 127.0.0.1 up
 ifconfig eth0 promisc
 
+[ "$(uname -r|grep -c 2.6)" = "1" ] && [ -x /sbin/robocfg ] && {
+  robocfg switch disable vlans enable reset vlan 0 ports "0 1 2 3 5t" vlan 1 ports "4 5t" port 4 state enabled stp none switch enable
+  robocfg show
+}
+
 HOSTNAME=$(nvram get wan_hostname)
 HOSTNAME=${HOSTNAME%%.*}
 echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
-- 
cgit v1.2.3


From 0d745a2406eff21faa963233dcd80ddcbc9560bd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Wed, 21 Sep 2005 04:25:36 +0000
Subject: start a shell only on 2.6 system on second serial device, reported by
 Peter Urbanec, triggers a bug on Asus WL500g deluxe

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1965 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/inittab | 1 -
 1 file changed, 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/inittab b/package/base-files/default/etc/inittab
index 3cbbe5af27..aab2df9562 100644
--- a/package/base-files/default/etc/inittab
+++ b/package/base-files/default/etc/inittab
@@ -1,4 +1,3 @@
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/sbin/halt
 tts/0::askfirst:/bin/ash --login
-tts/1::askfirst:/bin/ash --login
-- 
cgit v1.2.3


From 58842fb3925b1e9d6ed2e0e166210f18eb71ea20 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Wed, 28 Sep 2005 20:33:27 +0000
Subject: add second tty to initab again. kernel patch verified to work on asus
 wl500gx.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1995 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/inittab | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/inittab b/package/base-files/default/etc/inittab
index aab2df9562..3cbbe5af27 100644
--- a/package/base-files/default/etc/inittab
+++ b/package/base-files/default/etc/inittab
@@ -1,3 +1,4 @@
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/sbin/halt
 tts/0::askfirst:/bin/ash --login
+tts/1::askfirst:/bin/ash --login
-- 
cgit v1.2.3


From d485fa0d52572a81c7e19c5a304639b0c4012c4e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Thu, 29 Sep 2005 12:02:01 +0000
Subject: check if /proc/sys/reset exist, from sven-ola

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2002 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/preinit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index 34de88c602..ff9bb4b10a 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -5,7 +5,7 @@ mount none /proc -t proc
 insmod diag
 echo 0x01 > /proc/sys/diag
 sleep 1
-if [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
+if [ ! -f /proc/sys/reset ] || [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
 	export FAILSAFE=true
 	[ "$(nvram get boot_wait)" != "on" ] && {
 		nvram set boot_wait=on
-- 
cgit v1.2.3


From 223e7a327896f37526b3bcfbb7aa9ce490aabd93 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Fri, 30 Sep 2005 11:36:37 +0000
Subject: check if some /proc files exist, before using it, for systems without
 diag kernel modul

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2008 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S99done | 2 +-
 package/base-files/default/etc/preinit        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S99done b/package/base-files/default/etc/init.d/S99done
index ce60337212..a260ac3d6f 100755
--- a/package/base-files/default/etc/init.d/S99done
+++ b/package/base-files/default/etc/init.d/S99done
@@ -1,4 +1,4 @@
 #!/bin/sh
 # set leds to normal state
-echo "0x00" > /proc/sys/diag
+[ -f /proc/sys/diag ] && echo "0x00" > /proc/sys/diag
 sysctl -p >&-
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index ff9bb4b10a..d64fdaa513 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -3,9 +3,9 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
 insmod diag
-echo 0x01 > /proc/sys/diag
+[ -f /proc/sys/diag ] && echo 0x01 > /proc/sys/diag
 sleep 1
-if [ ! -f /proc/sys/reset ] || [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
+if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
 	export FAILSAFE=true
 	[ "$(nvram get boot_wait)" != "on" ] && {
 		nvram set boot_wait=on
-- 
cgit v1.2.3


From bede0c5872e0084199e73e4518da0b5a1670a7e0 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 2 Oct 2005 22:51:39 +0000
Subject: start httpd only if /www exists

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2032 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S50httpd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S50httpd b/package/base-files/default/etc/init.d/S50httpd
index 9cf551e5c6..01772c12ea 100755
--- a/package/base-files/default/etc/init.d/S50httpd
+++ b/package/base-files/default/etc/init.d/S50httpd
@@ -1,2 +1,2 @@
 #!/bin/sh
-httpd -p 80 -h /www -r WRT54G Router
+[ -d /www ] && httpd -p 80 -h /www -r WRT54G Router
-- 
cgit v1.2.3


From cec59778ae3bf1d430a6d782c09c4474a91cda3e Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 17 Oct 2005 13:59:06 +0000
Subject: bleeding sounds better ;)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2139 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/banner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/banner b/package/base-files/default/etc/banner
index 310a743513..a646e36a38 100644
--- a/package/base-files/default/etc/banner
+++ b/package/base-files/default/etc/banner
@@ -4,4 +4,4 @@
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
           
-	  cutting edge
+	  bleeding edge
-- 
cgit v1.2.3


From 4981f2051b9f52638c44dbd56803230b2116ffe4 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 17 Oct 2005 14:15:34 +0000
Subject: hello word ;P

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2142 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/banner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/banner b/package/base-files/default/etc/banner
index a646e36a38..610c0f3b5e 100644
--- a/package/base-files/default/etc/banner
+++ b/package/base-files/default/etc/banner
@@ -4,4 +4,4 @@
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
           
-	  bleeding edge
+	  bleeding edge ;)
-- 
cgit v1.2.3


From ba3b3022bd5216ef628116d6114633fb5f8e33e4 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 17 Oct 2005 21:27:07 +0000
Subject: some fixes/cleanups for the init scripts

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2152 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/firewall.user   | 2 ++
 package/base-files/default/etc/init.d/S50httpd | 2 +-
 package/base-files/default/etc/preinit         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/firewall.user b/package/base-files/default/etc/firewall.user
index 7a13141623..5774f0c64a 100755
--- a/package/base-files/default/etc/firewall.user
+++ b/package/base-files/default/etc/firewall.user
@@ -1,5 +1,7 @@
 #!/bin/sh
 . /etc/functions.sh
+. /etc/network.overrides
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
 WAN=$(nvram get wan_ifname)
 LAN=$(nvram get lan_ifname)
diff --git a/package/base-files/default/etc/init.d/S50httpd b/package/base-files/default/etc/init.d/S50httpd
index 01772c12ea..a1b883d0a8 100755
--- a/package/base-files/default/etc/init.d/S50httpd
+++ b/package/base-files/default/etc/init.d/S50httpd
@@ -1,2 +1,2 @@
 #!/bin/sh
-[ -d /www ] && httpd -p 80 -h /www -r WRT54G Router
+[ -d /www ] && httpd -p 80 -h /www -r OpenWrt
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index d64fdaa513..88c8920c94 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -7,7 +7,7 @@ insmod diag
 sleep 1
 if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
 	export FAILSAFE=true
-	[ "$(nvram get boot_wait)" != "on" ] && {
+	[ -x /usr/sbin/nvram -a "$(nvram get boot_wait)" != "on" ] && {
 		nvram set boot_wait=on
 		nvram commit
 	}
-- 
cgit v1.2.3


From 5c474e33b3f1b81368b09dee50a3969c6f2e79a5 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 22 Oct 2005 16:34:35 +0000
Subject: add svn revision to /etc/banner

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2246 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/banner | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/banner b/package/base-files/default/etc/banner
index 610c0f3b5e..02da7e8e20 100644
--- a/package/base-files/default/etc/banner
+++ b/package/base-files/default/etc/banner
@@ -3,5 +3,5 @@
  |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
-          
-	  bleeding edge ;)
+  
+         bleeding edge, $R ;)
-- 
cgit v1.2.3


From 970b7bcc234e88327961c1dbb7544452b4f2f528 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 22 Oct 2005 20:47:19 +0000
Subject: sync base-files with whiterussian

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2260 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh   | 50 +++++++++++++++++++++++++++
 package/base-files/default/etc/init.d/S10boot | 20 +----------
 package/base-files/default/etc/profile        |  1 +
 3 files changed, 52 insertions(+), 19 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index c813e39a61..bc9767f491 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -24,6 +24,56 @@ if_valid () (
   { debug "# missing interface '$1' ignored"; false; }
 )
 
+do_ifup() {
+	if_proto=$(nvram get ${2}_proto)
+	if=$(nvram get ${2}_ifname)
+	[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)
+	
+	pidfile=/var/run/${if}.pid
+	[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
+
+	case "$1" in
+	static)
+		ip=$(nvram get ${2}_ipaddr)
+		netmask=$(nvram get ${2}_netmask)
+		gateway=$(nvram get ${2}_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 ${2}_dns); do
+			echo "nameserver $dns" >> /etc/resolv.conf
+		done
+	;;
+	dhcp)
+		DHCP_IP=$(nvram get ${2}_ipaddr)
+		DHCP_NETMASK=$(nvram get ${2}_netmask)
+		$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
+
+		DHCP_ARGS="-i $if ${DHCP_IP:+-r $DHCP_IP} -b -p $pidfile"
+		DHCP_HOSTNAME=$(nvram get ${2}_hostname)
+		DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
+		[ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
+		[ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
+		oldpid=$(cat $pidfile)
+		${DEBUG:-eval} "udhcpc $DHCP_ARGS"
+		pidof udhcpc | grep "$oldpid" >&- 2>&- && {
+			sleep 1
+			kill -9 $oldpid
+		}
+	;;
+	none|"")
+	;;
+	*)
+		[ -x "/sbin/ifup.$1" ] && { $DEBUG /sbin/ifup.$1 ${2}; exit; }
+		echo "### ifup ${2}: ignored ${2}_proto=\"$1\" (not supported)"
+	;;
+	esac
+}
+
 bitcount () {
   local c=$1
   echo $((
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 66fece1d73..b0dc04eb7e 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -10,30 +10,12 @@ mkdir -p /var/log
 touch /var/log/wtmp
 touch /var/log/lastlog
 
-[ -x /usr/sbin/nvram ] && {
-  [ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && {
-    # if default wifi mac, set two higher than the lan mac
-    nvram set il0macaddr=$(nvram get et0macaddr|
-    awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
-  }
-
-  # set up the vlan*ports variables for the asus wl-500g deluxe
-  # if they don't already exist 
-  [  "$(nvram get boardtype)" = "bcm95365r" \
-  -a "$(nvram get boardnum)" = "45" \
-  -a -z "$(nvram get vlan0ports)" \
-  -a -z "$(nvram get vlan1ports)" ] && {
-  	nvram set vlan0ports="1 2 3 4 5*"
-  	nvram set vlan1ports="0 5"
-  }
-}
-
 sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
 
 ifconfig lo 127.0.0.1 up
 ifconfig eth0 promisc
 
-[ "$(uname -r|grep -c 2.6)" = "1" ] && [ -x /sbin/robocfg ] && {
+[ "$(uname -r|grep -c 2.6)" = "1" ] && [ -x /sbin/robocfg ] && { # FIXME: replace when the new switch driver is integrated...
   robocfg switch disable vlans enable reset vlan 0 ports "0 1 2 3 5t" vlan 1 ports "4 5t" port 4 state enabled stp none switch enable
   robocfg show
 }
diff --git a/package/base-files/default/etc/profile b/package/base-files/default/etc/profile
index 1d98ae3402..e3abe6967f 100644
--- a/package/base-files/default/etc/profile
+++ b/package/base-files/default/etc/profile
@@ -9,3 +9,4 @@ alias vim=vi
 
 arp() { cat /proc/net/arp; }
 ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
+reboot() { ifdown wan 2>&1 >/dev/null ; /sbin/reboot; }
-- 
cgit v1.2.3


From d6b2f37c24bc906b73a175bc4448bbcd79357c69 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Sun, 23 Oct 2005 18:12:01 +0000
Subject: turn tcp vegas on by default

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2282 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/sysctl.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/sysctl.conf b/package/base-files/default/etc/sysctl.conf
index 2050b0c886..b09b8cfd9e 100644
--- a/package/base-files/default/etc/sysctl.conf
+++ b/package/base-files/default/etc/sysctl.conf
@@ -5,3 +5,4 @@ net.ipv4.icmp_ignore_bogus_error_responses=1
 net.ipv4.tcp_fin_timeout=30
 net.ipv4.tcp_keepalive_time=120
 net.ipv4.tcp_timestamps=0
+net.ipv4.tcp_vegas_cong_avoid=1
-- 
cgit v1.2.3


From be5c7d2d2546417767bc5c3471b246fa4f94313e Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 7 Nov 2005 01:12:51 +0000
Subject: add hotplug stuff to trunk/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2364 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh        | 15 ++++---
 .../base-files/default/etc/hotplug.d/net/01-wds    |  5 +++
 .../base-files/default/etc/hotplug.d/usb/01-mount  | 49 ++++++++++++++++++++++
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 package/base-files/default/etc/hotplug.d/net/01-wds
 create mode 100644 package/base-files/default/etc/hotplug.d/usb/01-mount

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index bc9767f491..9cfc802357 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -41,12 +41,14 @@ do_ifup() {
 		$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 ${2}_dns); do
-			echo "nameserver $dns" >> /etc/resolv.conf
-		done
+		[ -f /etc/resolv.conf ] || {
+			debug "# --- creating /etc/resolv.conf ---"
+			for dns in $(nvram get ${2}_dns); do
+				echo "nameserver $dns" >> /etc/resolv.conf
+			done
+		}
+		
+		env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" &
 	;;
 	dhcp)
 		DHCP_IP=$(nvram get ${2}_ipaddr)
@@ -64,6 +66,7 @@ do_ifup() {
 			sleep 1
 			kill -9 $oldpid
 		}
+		# hotplug events are handled by /usr/share/udhcpc/default.script
 	;;
 	none|"")
 	;;
diff --git a/package/base-files/default/etc/hotplug.d/net/01-wds b/package/base-files/default/etc/hotplug.d/net/01-wds
new file mode 100644
index 0000000000..38bd69667f
--- /dev/null
+++ b/package/base-files/default/etc/hotplug.d/net/01-wds
@@ -0,0 +1,5 @@
+[ "${INTERFACE%%[0-9]*}" = "wds" ] && { 
+	ifconfig $INTERFACE 0.0.0.0 up
+	/usr/sbin/brctl addif br0 $INTERFACE
+}
+		
diff --git a/package/base-files/default/etc/hotplug.d/usb/01-mount b/package/base-files/default/etc/hotplug.d/usb/01-mount
new file mode 100644
index 0000000000..c28ada204e
--- /dev/null
+++ b/package/base-files/default/etc/hotplug.d/usb/01-mount
@@ -0,0 +1,49 @@
+mount_storage() {
+	cd /dev/discs
+	for dev in disc*; do
+		[ -f /tmp/.${dev}_id ] || {
+			echo ${INTERFACE}${PRODUCT} > /tmp/.${dev}_id
+			mount | grep /mnt/${dev} || (
+				[ -d /mnt/. ] || {
+					mkdir -p /tmp/mnt
+					ln -s /tmp/mnt /
+				}
+				cd $dev
+				for part in part*; do
+					path=/mnt/${dev}_${part##*part}
+					mkdir -p ${path}
+					mount ${part} ${path}
+				done
+			)
+		}
+	done
+}
+
+umount_storage() {
+	for tmp in /tmp/.*_id; do
+		id=$(cat $tmp 2>&-)
+		[ "${INTERFACE}${PRODUCT}" = "$id" ] && {
+			rm -f $tmp
+			disc=${tmp##*disc}
+			disc=${disc%%_id}
+			for disc in /mnt/disc${disc}*; do
+				umount -f $disc || umount -l $disc
+			done
+		}
+	done
+}
+
+[ -f /proc/bus/usb/devices ] || mount -t usbfs none /proc/bus/usb
+
+case "$ACTION" in
+	add)
+		case "${INTERFACE%%/*}" in
+			8) mount_storage ;;
+		esac
+	;;
+	remove)
+		case "${INTERFACE%%/*}" in
+			8) umount_storage ;;
+		esac
+	;;
+esac
-- 
cgit v1.2.3


From 72582c721989d47b78485678fef600a302962fa5 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 18 Nov 2005 14:08:36 +0000
Subject: don't clear the mangle table in the default firewall script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2517 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S45firewall | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 066bded5bf..8c67d82b18 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -11,7 +11,7 @@ WAN=$(nvram get wan_ifname)
 LAN=$(nvram get lan_ifname)
 
 ## CLEAR TABLES
-for T in filter nat mangle; do
+for T in filter nat; do
   iptables -t $T -F
   iptables -t $T -X
 done
-- 
cgit v1.2.3


From 277cd0f3ed6b7989df3a8bc965bd7f1f7a701f96 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 18 Nov 2005 20:55:53 +0000
Subject: add crond init script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2523 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S60cron | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 package/base-files/default/etc/init.d/S60cron

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron
new file mode 100755
index 0000000000..ed43e743d0
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S60cron
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -d /etc/crontabs ] && crond -c /etc/crontabs
-- 
cgit v1.2.3


From 041c66c348ee68f42d2bd2d15285867ba57558f2 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 19 Nov 2005 03:17:20 +0000
Subject: hotplug-based network script rewrite

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2531 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh        |  69 +-------
 .../base-files/default/etc/hotplug.d/net/01-wds    |   5 -
 .../base-files/default/etc/hotplug.d/net/10-net    | 190 +++++++++++++++++++++
 package/base-files/default/etc/init.d/S10boot      |  21 ++-
 package/base-files/default/etc/init.d/S40network   |   8 +-
 package/base-files/default/etc/nvram.sh            |   4 +-
 6 files changed, 211 insertions(+), 86 deletions(-)
 delete mode 100644 package/base-files/default/etc/hotplug.d/net/01-wds
 create mode 100644 package/base-files/default/etc/hotplug.d/net/10-net

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 9cfc802357..e7126473f4 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/sh
 . /etc/nvram.sh
 
 alias debug=${DEBUG:-:}
@@ -7,74 +7,11 @@ alias debug=${DEBUG:-:}
 if_valid () (
   ifconfig "$1" >&- 2>&- ||
   [ "${1%%[0-9]}" = "br" ] ||
-  {
-    [ "${1%%[0-9]}" = "vlan" ] && ( 
-      i=${1#vlan}
-      hwname=$(nvram get vlan${i}hwname)
-      hwaddr=$(nvram get ${hwname}macaddr)
-      [ -z "$hwaddr" ] && return 1
-
-      vif=$(ifconfig -a | awk '/^eth.*'$hwaddr'/ {print $1; exit}' IGNORECASE=1)
-      debug "# vlan$i => $vif"
-
-      $DEBUG ifconfig $vif up
-      $DEBUG vconfig add $vif $i 2>&-
-    )
-  } ||
   { debug "# missing interface '$1' ignored"; false; }
 )
 
-do_ifup() {
-	if_proto=$(nvram get ${2}_proto)
-	if=$(nvram get ${2}_ifname)
-	[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)
-	
-	pidfile=/var/run/${if}.pid
-	[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
-
-	case "$1" in
-	static)
-		ip=$(nvram get ${2}_ipaddr)
-		netmask=$(nvram get ${2}_netmask)
-		gateway=$(nvram get ${2}_gateway)
-
-		$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
-		${gateway:+$DEBUG route add default gw $gateway}
-
-		[ -f /etc/resolv.conf ] || {
-			debug "# --- creating /etc/resolv.conf ---"
-			for dns in $(nvram get ${2}_dns); do
-				echo "nameserver $dns" >> /etc/resolv.conf
-			done
-		}
-		
-		env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" &
-	;;
-	dhcp)
-		DHCP_IP=$(nvram get ${2}_ipaddr)
-		DHCP_NETMASK=$(nvram get ${2}_netmask)
-		$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
-
-		DHCP_ARGS="-i $if ${DHCP_IP:+-r $DHCP_IP} -b -p $pidfile"
-		DHCP_HOSTNAME=$(nvram get ${2}_hostname)
-		DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
-		[ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
-		[ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
-		oldpid=$(cat $pidfile)
-		${DEBUG:-eval} "udhcpc $DHCP_ARGS"
-		pidof udhcpc | grep "$oldpid" >&- 2>&- && {
-			sleep 1
-			kill -9 $oldpid
-		}
-		# hotplug events are handled by /usr/share/udhcpc/default.script
-	;;
-	none|"")
-	;;
-	*)
-		[ -x "/sbin/ifup.$1" ] && { $DEBUG /sbin/ifup.$1 ${2}; exit; }
-		echo "### ifup ${2}: ignored ${2}_proto=\"$1\" (not supported)"
-	;;
-	esac
+hotplug_dev() {
+	env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
 }
 
 bitcount () {
diff --git a/package/base-files/default/etc/hotplug.d/net/01-wds b/package/base-files/default/etc/hotplug.d/net/01-wds
deleted file mode 100644
index 38bd69667f..0000000000
--- a/package/base-files/default/etc/hotplug.d/net/01-wds
+++ /dev/null
@@ -1,5 +0,0 @@
-[ "${INTERFACE%%[0-9]*}" = "wds" ] && { 
-	ifconfig $INTERFACE 0.0.0.0 up
-	/usr/sbin/brctl addif br0 $INTERFACE
-}
-		
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
new file mode 100644
index 0000000000..29df1d2ce8
--- /dev/null
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -0,0 +1,190 @@
+#!/bin/sh
+setup_eth()
+{
+	[ -f /proc/net/wl0 ] && {
+		lsmod | grep wlcompat >&- || insmod wlcompat
+	}
+	iwconfig "$INTERFACE" 2>&- | grep -v 'no wireless' >&- && {
+		/sbin/wifi
+	}
+	if="$(echo "$INTERFACE" | sed s,eth,et,)"
+	ifconfig "$INTERFACE" up 2>&- >&-
+	for vlan in $(seq 0 15); do
+		[ "$(nvram get vlan${vlan}hwname)" = "$if" ] && \
+			$DEBUG vconfig add "$INTERFACE" "$vlan"
+	done
+}
+
+find_name()
+{
+	pppoa_ifname="atm0" # hack for ppp over atm, which has no ${proto}_ifname
+	interfaces="lan wan wifi $(nvram get ifnames)"
+	for ifname in $interfaces; do
+		IFTYPE="${ifname}"
+		IFPROTO="$(nvram get ${IFTYPE}_proto)"
+		IFACE="$(nvram get ${IFTYPE}_ifname)"
+		[ -z "$IFPROTO" -o "$IFPROTO" = "none" ] || {
+			[ "${IFACE}" = "$INTERFACE" ] && return 0
+			case "$IFPROTO" in
+				static|dhcp)
+					[ "${IFACE%%[0-9]*}" = "br" ] && {
+						for part in $(nvram get ${IFTYPE}_ifnames); do
+							[ "$part" = "$INTERFACE" ] && return 0
+						done
+					}
+				;;
+				*)
+					[ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
+					  -a -x /sbin/ifup.${IFPROTO} ] && return 0
+				;;
+			esac
+		}
+	done
+	IFACE=""
+	IFTYPE=""
+	IFPROTO=""
+	return 255
+}
+
+do_ifup() {
+	if="$3"
+	if_proto="$(nvram get ${2}_proto)"
+	
+	pidfile=/var/run/${if}.pid
+	[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
+
+	case "$1" in
+		static)
+			ip=$(nvram get ${2}_ipaddr)
+			netmask=$(nvram get ${2}_netmask)
+			gateway=$(nvram get ${2}_gateway)
+	
+			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
+			${gateway:+$DEBUG route add default gw $gateway}
+	
+			[ -f /etc/resolv.conf ] || {
+				debug "# --- creating /etc/resolv.conf ---"
+				for dns in $(nvram get ${2}_dns); do
+					echo "nameserver $dns" >> /etc/resolv.conf
+				done
+			}
+			
+			env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" &
+		;;
+		dhcp)
+			DHCP_IP=$(nvram get ${2}_ipaddr)
+			DHCP_NETMASK=$(nvram get ${2}_netmask)
+			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
+	
+			DHCP_ARGS="-i $if ${DHCP_IP:+-r $DHCP_IP} -b -p $pidfile"
+			DHCP_HOSTNAME=$(nvram get ${2}_hostname)
+			DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
+			[ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
+			[ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
+			oldpid=$(cat $pidfile)
+			${DEBUG:-eval} "udhcpc $DHCP_ARGS"
+			pidof udhcpc | grep "$oldpid" >&- 2>&- && {
+				sleep 1
+				kill -9 $oldpid
+			}
+			# hotplug events are handled by /usr/share/udhcpc/default.script
+		;;
+		*)
+			if [ -x "/sbin/ifup.$1" ]; then
+				( $DEBUG . /sbin/ifup.$1 ${2} $3 )
+			fi
+		;;
+	esac
+}
+
+do_register()
+{
+	case "${INTERFACE%%[0-9]*}" in
+		eth) setup_eth;;
+	esac
+
+	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && {
+		find_name || {
+			case "${INTERFACE%%[0-9]*}" in
+				wds) 
+					for tmp in lan wifi; do
+						[ -z "$IFPROTO" ] && [ "$(nvram get ${tmp}_ifname)" = "br0" ] && {
+							IFPROTO="$(nvram get ${tmp}_proto)"
+							IFTYPE="${tmp}"
+						}
+					done
+					[ -z "$IFPROTO" ] && return 0
+				;;
+				atm)
+					for tmp in lan wan wifi $(nvram get ifnames); do
+						[ "$(nvram get ${tmp}_proto)" = "pppoa" ] && {
+							do_ifup "pppoa" "$tmp" "$INTERFACE"
+							return 0
+						}
+					done
+				;;
+				*)
+					return 0
+				;;
+			esac
+		}
+	}
+
+	case "${INTERFACE%%[0-9]*}" in 
+		ppp|atm);;
+		*)
+			mac=$(nvram get ${IFTYPE}_hwaddr)
+			${mac:+$DEBUG ifconfig $INTERFACE down hw ether $mac}
+		;;
+	esac
+
+	if="$(nvram get ${IFTYPE}_ifname)"
+	if [ "${if%%[0-9]}" = "br" ]; then
+		if_valid "$INTERFACE" && {
+			ifconfig "$if" 2>&- >&- || {
+				stp=$(nvram get ${IFTYPE}_stp)
+				$DEBUG brctl addbr "$if"
+				$DEBUG brctl setfd "$if" 0
+				$DEBUG brctl stp "$if" "${stp:-0}"
+			}
+
+			if [ "$INTERFACE" != "$if" ]; then
+				$DEBUG ifconfig "$INTERFACE" 0.0.0.0 up
+				brctl addif "$if" "$INTERFACE"
+			else
+				do_ifup "$IFPROTO" "$IFTYPE" "$if"
+			fi
+		}
+	else
+		do_ifup "$IFPROTO" "$IFTYPE" "$if"
+	fi
+}
+
+do_unregister() {
+	[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
+	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name
+	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0
+	
+	[ "${IFACE%%[0-9]*}" = "br" ] && {
+		if [ "$INTERFACE" != "$IFACE" ]; then
+			brctl delif "$IFACE" "$INTERFACE" 2>&- >&-
+		else
+			brctl delbr "$IFACE" 2>&- >&-
+		fi
+	}
+	
+	case "$IFPROTO" in
+		pppoe|pppoa|pptp) 
+			killall ifup.${IFPROTO}
+			killall pppd
+		;;
+		dhcp)
+			[ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&-
+		;;
+	esac
+}
+
+case "$ACTION" in
+	register) do_register;;
+	unregister) do_unregister;;
+esac
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index b0dc04eb7e..d5ec19436a 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -5,10 +5,22 @@
         echo "S" > /proc/jffs2_bbc
 }
 
+vconfig set_name_type VLAN_PLUS_VID_NO_PAD
+
+HOSTNAME=$(nvram get wan_hostname)
+HOSTNAME=${HOSTNAME%%.*}
+echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
+
+# automagically run firstboot
+[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
+	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
+}
+
 mkdir -p /var/run
 mkdir -p /var/log
 touch /var/log/wtmp
 touch /var/log/lastlog
+[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
 sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
 
@@ -20,13 +32,4 @@ ifconfig eth0 promisc
   robocfg show
 }
 
-HOSTNAME=$(nvram get wan_hostname)
-HOSTNAME=${HOSTNAME%%.*}
-echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
-
-vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 
-# automagically run firstboot
-[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
-	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
-}
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index df7c6b3515..168fd2979b 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -3,10 +3,10 @@
 [ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 case "$1" in
   start|restart)
-    ifup lan
-    ifup wan
-    ifup wifi
-    wifi up
+#    ifup lan
+#    ifup wan
+#    ifup wifi
+#    wifi up
 
     for route in $(nvram get static_route); do {
       eval "set $(echo $route | sed 's/:/ /g')"
diff --git a/package/base-files/default/etc/nvram.sh b/package/base-files/default/etc/nvram.sh
index f1170ac470..4d39a10204 100644
--- a/package/base-files/default/etc/nvram.sh
+++ b/package/base-files/default/etc/nvram.sh
@@ -4,8 +4,8 @@
 nvram () {
   if [ -x /usr/sbin/nvram ]; then
     case $1 in
-      get) eval "echo \${$2:-\$(command nvram get $2)}";;
-      *) command nvram $*;;
+      get) eval "echo \${$2:-\$(/usr/sbin/nvram get $2)}";;
+      *) /usr/sbin/nvram $*;;
     esac
   else
     case $1 in
-- 
cgit v1.2.3


From 5f682d247464c93194f56f693b5387dbd44db5a9 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 19 Nov 2005 14:53:21 +0000
Subject: fix ifup/down for ppp-based stuff

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2536 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 29df1d2ce8..3bc980f86f 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -175,8 +175,8 @@ do_unregister() {
 	
 	case "$IFPROTO" in
 		pppoe|pppoa|pptp) 
-			killall ifup.${IFPROTO}
-			killall pppd
+			killall ifup.${IFPROTO} 2>&- >&-
+			killall pppd 2>&- >&-
 		;;
 		dhcp)
 			[ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&-
-- 
cgit v1.2.3


From 5bb06f299ab3d2138971c9eefcb6689034694dab Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 19 Nov 2005 19:04:15 +0000
Subject: more fixes for the network scripts

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2537 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../base-files/default/etc/hotplug.d/net/10-net    | 39 +++++++++++-----------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 3bc980f86f..19f53abd7d 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -23,22 +23,21 @@ find_name()
 		IFTYPE="${ifname}"
 		IFPROTO="$(nvram get ${IFTYPE}_proto)"
 		IFACE="$(nvram get ${IFTYPE}_ifname)"
-		[ -z "$IFPROTO" -o "$IFPROTO" = "none" ] || {
-			[ "${IFACE}" = "$INTERFACE" ] && return 0
-			case "$IFPROTO" in
-				static|dhcp)
-					[ "${IFACE%%[0-9]*}" = "br" ] && {
-						for part in $(nvram get ${IFTYPE}_ifnames); do
-							[ "$part" = "$INTERFACE" ] && return 0
-						done
-					}
-				;;
-				*)
-					[ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
-					  -a -x /sbin/ifup.${IFPROTO} ] && return 0
-				;;
-			esac
-		}
+		case "$IFPROTO" in
+			""|none);;
+			static|dhcp)
+				[ "${IFACE}" = "$INTERFACE" ] && return 0
+				[ "${IFACE%%[0-9]*}" = "br" ] && {
+					for part in $(nvram get ${IFTYPE}_ifnames); do
+						[ "$part" = "$INTERFACE" ] && return 0
+					done
+				}
+			;;
+			*)
+				[ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
+				  -a -x /sbin/ifup.${IFPROTO} ] && return 0
+			;;
+		esac
 	done
 	IFACE=""
 	IFTYPE=""
@@ -155,13 +154,12 @@ do_register()
 				do_ifup "$IFPROTO" "$IFTYPE" "$if"
 			fi
 		}
-	else
-		do_ifup "$IFPROTO" "$IFTYPE" "$if"
+	else 
+		[ "${INTERFACE%%[0-9]*}" = "ppp" ] || do_ifup "$IFPROTO" "$IFTYPE" "$if"
 	fi
 }
 
 do_unregister() {
-	[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
 	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name
 	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0
 	
@@ -175,13 +173,14 @@ do_unregister() {
 	
 	case "$IFPROTO" in
 		pppoe|pppoa|pptp) 
-			killall ifup.${IFPROTO} 2>&- >&-
 			killall pppd 2>&- >&-
 		;;
 		dhcp)
 			[ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&-
 		;;
 	esac
+
+	[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
 }
 
 case "$ACTION" in
-- 
cgit v1.2.3


From 696c05bcfefdc88d530c92ee36498f5787d9d853 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 11 Dec 2005 22:00:56 +0000
Subject: create /var/spool/cron in cron init script and change the default
 crontab location to /etc/crontabs (fixes #88)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2621 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S60cron | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron
index ed43e743d0..6647fe1bc0 100755
--- a/package/base-files/default/etc/init.d/S60cron
+++ b/package/base-files/default/etc/init.d/S60cron
@@ -1,2 +1,5 @@
 #!/bin/sh
-[ -d /etc/crontabs ] && crond -c /etc/crontabs
+[ -d /etc/crontabs ] && {
+	mkdir -p /var/spool/cron
+	crond -c /etc/crontabs
+}
-- 
cgit v1.2.3


From a860a5b427b32ac15c20e318175a6b18b2209a60 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 17 Dec 2005 02:11:04 +0000
Subject: fix network hotplug scripts for 2.6

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2711 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 19f53abd7d..0417b397f7 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -184,6 +184,6 @@ do_unregister() {
 }
 
 case "$ACTION" in
-	register) do_register;;
-	unregister) do_unregister;;
+	add|register) do_register;;
+	remove|unregister) do_unregister;;
 esac
-- 
cgit v1.2.3


From 11f062c66f54d34d8399b0a5601aba6704d39b6d Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Tue, 20 Dec 2005 15:03:08 +0000
Subject: add recipe to banner

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2739 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/banner | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/banner b/package/base-files/default/etc/banner
index 02da7e8e20..c2fbc12680 100644
--- a/package/base-files/default/etc/banner
+++ b/package/base-files/default/etc/banner
@@ -3,5 +3,8 @@
  |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
-  
-         bleeding edge, $R ;)
+ KAMIKAZE (bleeding edge, $R) -------------------
+  * 10 oz Vodka       Shake well with ice and strain
+  * 10 oz Triple sec  mixture into 10 shot glasses.
+  * 10 oz lime juice  Salute!
+ ---------------------------------------------------
-- 
cgit v1.2.3


From e9d1bf5df5a1a4f155de9598890d7415f0632842 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Sun, 25 Dec 2005 00:56:25 +0000
Subject: change ipkg.conf to use snapshots

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2765 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/ipkg.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/ipkg.conf b/package/base-files/default/etc/ipkg.conf
index 3867213313..2931d2cf80 100644
--- a/package/base-files/default/etc/ipkg.conf
+++ b/package/base-files/default/etc/ipkg.conf
@@ -1,3 +1,3 @@
-src experimental http://openwrt.org/downloads/experimental/bin/packages
+src snapshots http://openwrt.org/downloads/snapshots/$S/packages
 dest root /
 dest ram /tmp
-- 
cgit v1.2.3


From a21254de1a4c6bb4d00fb8398082b81a5e10cc13 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 2 Jan 2006 13:16:32 +0000
Subject: Corrected ticket #168

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2805 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S60cron | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron
index 6647fe1bc0..bd12b8bb78 100755
--- a/package/base-files/default/etc/init.d/S60cron
+++ b/package/base-files/default/etc/init.d/S60cron
@@ -1,5 +1,8 @@
 #!/bin/sh
-[ -d /etc/crontabs ] && {
+[ -d /etc/crontabs ] || mkdir -p /etc/crontabs
+
+[ -e /var/spool/cron/crontabs ] && {
 	mkdir -p /var/spool/cron
-	crond -c /etc/crontabs
+	ln -s /etc/crontabs /var/spool/cron
 }
+	crond -c /etc/crontabs
-- 
cgit v1.2.3


From 367c1dad13f5a34e7f59002109e4df40ec2158f8 Mon Sep 17 00:00:00 2001
From: OpenWrt Developers <openwrt-devel@openwrt.org>
Date: Mon, 2 Jan 2006 20:21:33 +0000
Subject: hopefully last fix for S60cron

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2812 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S60cron | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron
index bd12b8bb78..6069b8177e 100755
--- a/package/base-files/default/etc/init.d/S60cron
+++ b/package/base-files/default/etc/init.d/S60cron
@@ -1,8 +1,6 @@
 #!/bin/sh
 [ -d /etc/crontabs ] || mkdir -p /etc/crontabs
-
-[ -e /var/spool/cron/crontabs ] && {
-	mkdir -p /var/spool/cron
-	ln -s /etc/crontabs /var/spool/cron
-}
-	crond -c /etc/crontabs
+[ -e /var/spool/cron/crontabs ] || {
+        mkdir -p /var/spool/cron
+        ln -s /etc/crontabs /var/spool/cron/crontabs
+} && crond -c /etc/crontabs
-- 
cgit v1.2.3


From 927ab463fb65539129594f22c42bcdb71ba34f25 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Tue, 3 Jan 2006 04:46:37 +0000
Subject: remove unused robocfg stuff

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2815 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index d5ec19436a..4c5e7a5852 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -27,9 +27,3 @@ sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
 ifconfig lo 127.0.0.1 up
 ifconfig eth0 promisc
 
-[ "$(uname -r|grep -c 2.6)" = "1" ] && [ -x /sbin/robocfg ] && { # FIXME: replace when the new switch driver is integrated...
-  robocfg switch disable vlans enable reset vlan 0 ports "0 1 2 3 5t" vlan 1 ports "4 5t" port 4 state enabled stp none switch enable
-  robocfg show
-}
-
-
-- 
cgit v1.2.3


From 9feda69af9dd6682ef0f92a4f63c223f1174e18b Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 3 Jan 2006 12:53:01 +0000
Subject: Added mrd6 package : IPv6 multicast routing daemon

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2816 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S45firewall | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 8c67d82b18..0110cfc775 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -81,9 +81,11 @@ iptables -t nat -N postrouting_rule
   iptables -A FORWARD -j forwarding_rule
 
   # allow
-  iptables -A FORWARD -i br0 -o br0 -j ACCEPT
-  [ -z "$WAN" ] || iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT
-
+  # if there is bridge splitting this workaround works too
+  for iface in $LAN; do
+  	iptables -A FORWARD -i $iface -o $iface -j ACCEPT
+	[ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
+  done
   # reject (what to do with anything not allowed earlier)
   # uses the default -P DROP
 
-- 
cgit v1.2.3


From c10dcf975ad5b0931733459f85cf104ef6538394 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 Jan 2006 20:08:27 +0000
Subject: configure switch at boot time based on vlan*ports

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2822 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 0417b397f7..fb7b128eab 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -7,11 +7,19 @@ setup_eth()
 	iwconfig "$INTERFACE" 2>&- | grep -v 'no wireless' >&- && {
 		/sbin/wifi
 	}
+	[ -d /proc/switch ] || {
+		insmod switch-core
+		insmod switch-robo || insmod switch-adm
+	}
 	if="$(echo "$INTERFACE" | sed s,eth,et,)"
 	ifconfig "$INTERFACE" up 2>&- >&-
 	for vlan in $(seq 0 15); do
-		[ "$(nvram get vlan${vlan}hwname)" = "$if" ] && \
+		[ "$(nvram get vlan${vlan}hwname)" = "$if" ] && {
 			$DEBUG vconfig add "$INTERFACE" "$vlan"
+			vports="$(nvram get vlan${vlan}ports)"
+			[ \! -z "$vports" -a -d "/proc/switch/$INTERFACE" ] && \
+				echo "$vports" > "/proc/switch/$INTERFACE/vlan/$vlan/ports"
+		}
 	done
 }
 
-- 
cgit v1.2.3


From df47e52565731c858615488dc6c937483bfc449f Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 Jan 2006 20:34:08 +0000
Subject: fix hotplug issue with compiled-in ethernet drivers

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2823 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 4c5e7a5852..9dd0beb1c7 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -22,6 +22,10 @@ touch /var/log/wtmp
 touch /var/log/lastlog
 [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
+for iface in $(/sbin/ifconfig -a | awk '{print $1}' | grep eth); do
+	/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
+done
+
 sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
 
 ifconfig lo 127.0.0.1 up
-- 
cgit v1.2.3


From d6a73d30bd8a704067094d28fd535711ceec0190 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 Jan 2006 23:50:17 +0000
Subject: move firstboot to preinit for now (until a better solution is
 implemented), required by /etc/config/network generator

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2830 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 5 -----
 package/base-files/default/etc/preinit        | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 9dd0beb1c7..02fddee7ba 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -11,11 +11,6 @@ HOSTNAME=$(nvram get wan_hostname)
 HOSTNAME=${HOSTNAME%%.*}
 echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 
-# automagically run firstboot
-[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
-	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
-}
-
 mkdir -p /var/run
 mkdir -p /var/log
 touch /var/log/wtmp
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index 88c8920c94..ac9039ca71 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -16,4 +16,9 @@ fi
 
 mount_root ${FAILSAFE:+failsafe}
 
+# automagically run firstboot
+[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
+	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
+}
+
 exec /sbin/init
-- 
cgit v1.2.3


From 9a1fcefbfdf28cb5fdacb422b7ad54f4d0f86dfa Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 5 Jan 2006 01:41:29 +0000
Subject: mount sysfs at boot on linux 2.6

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2835 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/preinit | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index ac9039ca71..f82823ec9c 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -21,4 +21,9 @@ mount_root ${FAILSAFE:+failsafe}
 	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
 }
 
+grep sysfs /proc/filesystems >&- 2>&- && {
+	mkdir -p /sys
+	mount -t sysfs none /sys
+}
+
 exec /sbin/init
-- 
cgit v1.2.3


From b64419999901cbbc998d6d75cbfef6cbb5b5bc85 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 8 Jan 2006 18:10:40 +0000
Subject: Merged enhancements submitted by Stereo, thanks, closes #188 and #189

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2863 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S50telnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet
index 599c3540eb..e7d4d36773 100755
--- a/package/base-files/default/etc/init.d/S50telnet
+++ b/package/base-files/default/etc/init.d/S50telnet
@@ -1,2 +1,2 @@
 #!/bin/sh
-telnetd -l /bin/login
+if awk -F: '/^root:/ && $2 !~ /\*/ {exit 1}' /etc/passwd 2>/dev/null || test $FAILSAFE; then telnetd -l /bin/login; fi
-- 
cgit v1.2.3


From 93157f4e700a1a0fbf0c93b644a87f4d0e903009 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 10 Jan 2006 21:16:46 +0000
Subject: use /tmp/resolv.conf when using a static nameserver (#177)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2884 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index fb7b128eab..7c8cd67a4e 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -69,10 +69,10 @@ do_ifup() {
 			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
 			${gateway:+$DEBUG route add default gw $gateway}
 	
-			[ -f /etc/resolv.conf ] || {
-				debug "# --- creating /etc/resolv.conf ---"
+			[ -f /tmp/resolv.conf ] || {
+				debug "# --- creating /tmp/resolv.conf ---"
 				for dns in $(nvram get ${2}_dns); do
-					echo "nameserver $dns" >> /etc/resolv.conf
+					echo "nameserver $dns" >> /tmp/resolv.conf
 				done
 			}
 			
-- 
cgit v1.2.3


From 7117cc818803bdff9685c4878115bf01398da3de Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 10 Jan 2006 21:20:09 +0000
Subject: add ipv6 support to network scripts (#101)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2885 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 7c8cd67a4e..187b937c60 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -63,10 +63,13 @@ do_ifup() {
 	case "$1" in
 		static)
 			ip=$(nvram get ${2}_ipaddr)
+			ip6=$(nvram get ${2}_ip6addr)
 			netmask=$(nvram get ${2}_netmask)
 			gateway=$(nvram get ${2}_gateway)
 	
 			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
+			[ -n "$ip6" ] && $DEBUG ifconfig $if add $ip6
+
 			${gateway:+$DEBUG route add default gw $gateway}
 	
 			[ -f /tmp/resolv.conf ] || {
-- 
cgit v1.2.3


From a0f7416c539ce302eb9f6bd61bbe02604c715a4d Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 11 Jan 2006 16:13:25 +0000
Subject: Fixed network autoconfiguration as explained in #200, fixes #200

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2912 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 187b937c60..b63eba090b 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,6 +1,9 @@
 #!/bin/sh
 setup_eth()
 {
+    	for part in $(nvram get unused_ifnames); do
+		[ "$part" = "$INTERFACE" ] && return 0
+	done
 	[ -f /proc/net/wl0 ] && {
 		lsmod | grep wlcompat >&- || insmod wlcompat
 	}
-- 
cgit v1.2.3


From 6ca2243ea244b4bfeb36b1f39c46ce3705d62ebf Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 12 Jan 2006 10:56:09 +0000
Subject: Added vlan enabling as suggested in #204, closes #204

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2931 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index b63eba090b..9a4c450038 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -22,6 +22,7 @@ setup_eth()
 			vports="$(nvram get vlan${vlan}ports)"
 			[ \! -z "$vports" -a -d "/proc/switch/$INTERFACE" ] && \
 				echo "$vports" > "/proc/switch/$INTERFACE/vlan/$vlan/ports"
+				echo "1" > "/proc/switch/$INTERFACE/enable_vlan"
 		}
 	done
 }
-- 
cgit v1.2.3


From a10b75e5790a05dbe8d7dd8cf2e82d51c7469ec1 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 14 Jan 2006 02:16:52 +0000
Subject: don't use /dev/tts/1 as login console

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2971 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/inittab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/inittab b/package/base-files/default/etc/inittab
index 3cbbe5af27..5916311e17 100644
--- a/package/base-files/default/etc/inittab
+++ b/package/base-files/default/etc/inittab
@@ -1,4 +1,4 @@
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/sbin/halt
 tts/0::askfirst:/bin/ash --login
-tts/1::askfirst:/bin/ash --login
+#tts/1::askfirst:/bin/ash --login
-- 
cgit v1.2.3


From 32a46a58384436cee3b18b3621693903872b86f5 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 14 Jan 2006 02:31:36 +0000
Subject: move vlan and wifi setup into arch-specific base-files

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2973 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../base-files/default/etc/hotplug.d/net/10-net    | 24 ++--------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 9a4c450038..8d2c6a8034 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,30 +1,10 @@
 #!/bin/sh
 setup_eth()
 {
-    	for part in $(nvram get unused_ifnames); do
-		[ "$part" = "$INTERFACE" ] && return 0
+	for part in $(nvram get unused_ifnames); do
+		[ "$part" = "$INTERFACE" ] && exit 0
 	done
-	[ -f /proc/net/wl0 ] && {
-		lsmod | grep wlcompat >&- || insmod wlcompat
-	}
-	iwconfig "$INTERFACE" 2>&- | grep -v 'no wireless' >&- && {
-		/sbin/wifi
-	}
-	[ -d /proc/switch ] || {
-		insmod switch-core
-		insmod switch-robo || insmod switch-adm
-	}
-	if="$(echo "$INTERFACE" | sed s,eth,et,)"
 	ifconfig "$INTERFACE" up 2>&- >&-
-	for vlan in $(seq 0 15); do
-		[ "$(nvram get vlan${vlan}hwname)" = "$if" ] && {
-			$DEBUG vconfig add "$INTERFACE" "$vlan"
-			vports="$(nvram get vlan${vlan}ports)"
-			[ \! -z "$vports" -a -d "/proc/switch/$INTERFACE" ] && \
-				echo "$vports" > "/proc/switch/$INTERFACE/vlan/$vlan/ports"
-				echo "1" > "/proc/switch/$INTERFACE/enable_vlan"
-		}
-	done
 }
 
 find_name()
-- 
cgit v1.2.3


From ccf69df20219eb1f92b39eb17aea2e10f8526c66 Mon Sep 17 00:00:00 2001
From: OpenWrt Developers <openwrt-devel@openwrt.org>
Date: Sat, 14 Jan 2006 20:18:39 +0000
Subject: fixes #207

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2983 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S50telnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet
index e7d4d36773..ff5659ed47 100755
--- a/package/base-files/default/etc/init.d/S50telnet
+++ b/package/base-files/default/etc/init.d/S50telnet
@@ -1,2 +1,2 @@
 #!/bin/sh
-if awk -F: '/^root:/ && $2 !~ /\*/ {exit 1}' /etc/passwd 2>/dev/null || test $FAILSAFE; then telnetd -l /bin/login; fi
+if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null || test $FAILSAFE; then telnetd -l /bin/login; fi
-- 
cgit v1.2.3


From 8eb40fecefeff3aaa12e285f6a6a8416f10d3742 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 16 Jan 2006 03:14:59 +0000
Subject: port wan_device changes from whiterussian to kamikaze

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2993 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 8d2c6a8034..dd4ee8863a 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -26,7 +26,7 @@ find_name()
 				}
 			;;
 			*)
-				[ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
+				[ "$(nvram get ${IFTYPE}_device)" = "$INTERFACE" \
 				  -a -x /sbin/ifup.${IFPROTO} ] && return 0
 			;;
 		esac
-- 
cgit v1.2.3


From f29a368c3dc265edde927e64f51ff181089bab81 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Mon, 16 Jan 2006 19:16:20 +0000
Subject: fix error messages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2996 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index dd4ee8863a..4579a84704 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -75,12 +75,7 @@ do_ifup() {
 			DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
 			[ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
 			[ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
-			oldpid=$(cat $pidfile)
 			${DEBUG:-eval} "udhcpc $DHCP_ARGS"
-			pidof udhcpc | grep "$oldpid" >&- 2>&- && {
-				sleep 1
-				kill -9 $oldpid
-			}
 			# hotplug events are handled by /usr/share/udhcpc/default.script
 		;;
 		*)
-- 
cgit v1.2.3


From d82a7facc2b1d836b672b92b759a307e9abfa56f Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Mon, 23 Jan 2006 21:45:44 +0000
Subject: revert bad firewall patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3042 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S45firewall | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 0110cfc775..8789fbab60 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -81,11 +81,8 @@ iptables -t nat -N postrouting_rule
   iptables -A FORWARD -j forwarding_rule
 
   # allow
-  # if there is bridge splitting this workaround works too
-  for iface in $LAN; do
-  	iptables -A FORWARD -i $iface -o $iface -j ACCEPT
-	[ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
-  done
+  iptables -A FORWARD -i br0 -o br0 -j ACCEPT
+
   # reject (what to do with anything not allowed earlier)
   # uses the default -P DROP
 
-- 
cgit v1.2.3


From b6119a90d5ac83cf46af744a14e63083803b4273 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 31 Jan 2006 11:36:01 +0000
Subject: set ALLMULTI on bridged interfaces (should improve multicast
 bridging)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3079 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 4579a84704..0f384ec46b 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -139,7 +139,8 @@ do_register()
 
 			if [ "$INTERFACE" != "$if" ]; then
 				$DEBUG ifconfig "$INTERFACE" 0.0.0.0 up
-				brctl addif "$if" "$INTERFACE"
+				$DEBUG brctl addif "$if" "$INTERFACE"
+				$DEBUG ifconfig "$INTERFACE" allmulti
 			else
 				do_ifup "$IFPROTO" "$IFTYPE" "$if"
 			fi
-- 
cgit v1.2.3


From a5d9d02c3a7a26f91ea99c83598dbca32136872e Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Wed, 1 Feb 2006 10:47:17 +0000
Subject: move sysfs to mount_root

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3107 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/preinit | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index f82823ec9c..ac9039ca71 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -21,9 +21,4 @@ mount_root ${FAILSAFE:+failsafe}
 	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
 }
 
-grep sysfs /proc/filesystems >&- 2>&- && {
-	mkdir -p /sys
-	mount -t sysfs none /sys
-}
-
 exec /sbin/init
-- 
cgit v1.2.3


From e0af0a4eb8fe94c5b9eb3baf074fdcf5183c10d0 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Wed, 1 Feb 2006 23:53:19 +0000
Subject: change cp to $(CP)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S45firewall | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 8789fbab60..0110cfc775 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -81,8 +81,11 @@ iptables -t nat -N postrouting_rule
   iptables -A FORWARD -j forwarding_rule
 
   # allow
-  iptables -A FORWARD -i br0 -o br0 -j ACCEPT
-
+  # if there is bridge splitting this workaround works too
+  for iface in $LAN; do
+  	iptables -A FORWARD -i $iface -o $iface -j ACCEPT
+	[ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
+  done
   # reject (what to do with anything not allowed earlier)
   # uses the default -P DROP
 
-- 
cgit v1.2.3


From 48f86d0141076bbe436e75e211ef635c7e683c3d Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Thu, 2 Feb 2006 10:07:28 +0000
Subject: fixes files from [3112]

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3114 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S45firewall | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 0110cfc775..2942f3118e 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -81,11 +81,9 @@ iptables -t nat -N postrouting_rule
   iptables -A FORWARD -j forwarding_rule
 
   # allow
-  # if there is bridge splitting this workaround works too
-  for iface in $LAN; do
-  	iptables -A FORWARD -i $iface -o $iface -j ACCEPT
-	[ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
-  done
+  iptables -A FORWARD -i br0 -o br0 -j ACCEPT
+  [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
+
   # reject (what to do with anything not allowed earlier)
   # uses the default -P DROP
 
-- 
cgit v1.2.3


From 441f04b70156a162833b35b680a1dbff3b3d8217 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Fri, 10 Feb 2006 18:08:38 +0000
Subject: Correct a few typos

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3212 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S45firewall | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 2942f3118e..8c67d82b18 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -82,7 +82,7 @@ iptables -t nat -N postrouting_rule
 
   # allow
   iptables -A FORWARD -i br0 -o br0 -j ACCEPT
-  [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
+  [ -z "$WAN" ] || iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT
 
   # reject (what to do with anything not allowed earlier)
   # uses the default -P DROP
-- 
cgit v1.2.3


From e1b417ee76bd97a05854f4304cef3f73e9da633b Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 5 Apr 2006 02:09:22 +0000
Subject: large init script cleanup and merge of whiterussian changes, new
 dnsmasq config handling

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3588 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/firewall.user       | 29 -------
 package/base-files/default/etc/functions.sh        | 26 ------
 .../base-files/default/etc/hotplug.d/net/10-net    | 85 +++++++++----------
 package/base-files/default/etc/init.d/S10boot      |  9 +-
 package/base-files/default/etc/init.d/S40network   | 16 ----
 package/base-files/default/etc/init.d/S45firewall  | 96 ----------------------
 package/base-files/default/etc/init.d/S50telnet    |  2 +-
 package/base-files/default/etc/init.d/S60cron      |  8 +-
 package/base-files/default/etc/init.d/S98done      |  9 ++
 package/base-files/default/etc/init.d/S99done      |  4 -
 package/base-files/default/etc/init.d/rcS          | 10 ++-
 package/base-files/default/etc/inittab             |  1 -
 package/base-files/default/etc/preinit             | 23 ++----
 13 files changed, 67 insertions(+), 251 deletions(-)
 delete mode 100755 package/base-files/default/etc/firewall.user
 delete mode 100755 package/base-files/default/etc/init.d/S40network
 delete mode 100755 package/base-files/default/etc/init.d/S45firewall
 create mode 100755 package/base-files/default/etc/init.d/S98done
 delete mode 100755 package/base-files/default/etc/init.d/S99done

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/firewall.user b/package/base-files/default/etc/firewall.user
deleted file mode 100755
index 5774f0c64a..0000000000
--- a/package/base-files/default/etc/firewall.user
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-. /etc/functions.sh
-. /etc/network.overrides
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
-
-WAN=$(nvram get wan_ifname)
-LAN=$(nvram get lan_ifname)
-
-iptables -F input_rule
-iptables -F output_rule
-iptables -F forwarding_rule
-iptables -t nat -F prerouting_rule
-iptables -t nat -F postrouting_rule
-
-### BIG FAT DISCLAIMER
-### The "-i $WAN" literally means packets that came in over the $WAN interface;
-### this WILL NOT MATCH packets sent from the LAN to the WAN address.
-
-### Allow SSH on the WAN interface
-# 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
diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index e7126473f4..526ca52dda 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
-. /etc/nvram.sh
-
 alias debug=${DEBUG:-:}
 
 # valid interface?
@@ -13,27 +11,3 @@ if_valid () (
 hotplug_dev() {
 	env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
 }
-
-bitcount () {
-  local c=$1
-  echo $((
-  c=((c>> 1)&0x55555555)+(c&0x55555555),
-  c=((c>> 2)&0x33333333)+(c&0x33333333),
-  c=((c>> 4)&0x0f0f0f0f)+(c&0x0f0f0f0f),
-  c=((c>> 8)&0x00ff00ff)+(c&0x00ff00ff),
-  c=((c>>16)&0x0000ffff)+(c&0x0000ffff)
-  ))
-}
-
-valid_netmask () {
-  return $((-($1)&~$1))
-}
-
-ip2int () (
-  set $(echo $1 | tr '\.' ' ')
-  echo $(($1<<24|$2<<16|$3<<8|$4))
-)
-
-int2ip () {
-  echo $(($1>>24&255)).$(($1>>16&255)).$(($1>>8&255)).$(($1&255))
-}
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 0f384ec46b..4bb69378ff 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,32 +1,28 @@
 #!/bin/sh
-setup_eth()
-{
-	for part in $(nvram get unused_ifnames); do
-		[ "$part" = "$INTERFACE" ] && exit 0
-	done
-	ifconfig "$INTERFACE" up 2>&- >&-
-}
-
 find_name()
 {
-	pppoa_ifname="atm0" # hack for ppp over atm, which has no ${proto}_ifname
-	interfaces="lan wan wifi $(nvram get ifnames)"
-	for ifname in $interfaces; do
+	for ifname in lan wan wifi ${ifnames}; do
 		IFTYPE="${ifname}"
-		IFPROTO="$(nvram get ${IFTYPE}_proto)"
-		IFACE="$(nvram get ${IFTYPE}_ifname)"
+		eval "IFPROTO=\"\${${IFTYPE}_proto}\""
+		eval "IFACE=\"\${${IFTYPE}_ifname}\""
 		case "$IFPROTO" in
 			""|none);;
 			static|dhcp)
 				[ "${IFACE}" = "$INTERFACE" ] && return 0
 				[ "${IFACE%%[0-9]*}" = "br" ] && {
-					for part in $(nvram get ${IFTYPE}_ifnames); do
+					eval "ifs=\"\${${IFTYPE}_ifnames}\""
+					for part in $ifs; do
 						[ "$part" = "$INTERFACE" ] && return 0
 					done
 				}
 			;;
+			pppoa)
+				[ "$INTERFACE" = "atm0" \
+				  -a -x /sbin/ifup.${IFPROTO} ] && return 0
+			;;
 			*)
-				[ "$(nvram get ${IFTYPE}_device)" = "$INTERFACE" \
+				eval "device=\"\${${IFTYPE}_device}\""
+				[ "$device" = "$INTERFACE" \
 				  -a -x /sbin/ifup.${IFPROTO} ] && return 0
 			;;
 		esac
@@ -39,17 +35,18 @@ find_name()
 
 do_ifup() {
 	if="$3"
-	if_proto="$(nvram get ${2}_proto)"
+	eval "if_proto=\"\${${2}_proto}\""
 	
 	pidfile=/var/run/${if}.pid
 	[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
 
 	case "$1" in
 		static)
-			ip=$(nvram get ${2}_ipaddr)
-			ip6=$(nvram get ${2}_ip6addr)
-			netmask=$(nvram get ${2}_netmask)
-			gateway=$(nvram get ${2}_gateway)
+			eval "ip=\"\${${2}_ipaddr}\""
+			eval "ip6=\"\${${2}_ip6addr}\""
+			eval "netmask=\"\${${2}_netmask}\""
+			eval "gateway=\"\${${2}_gateway}\""
+			eval "dns=\"\${${2}_dns}\""
 	
 			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
 			[ -n "$ip6" ] && $DEBUG ifconfig $if add $ip6
@@ -58,24 +55,25 @@ do_ifup() {
 	
 			[ -f /tmp/resolv.conf ] || {
 				debug "# --- creating /tmp/resolv.conf ---"
-				for dns in $(nvram get ${2}_dns); do
-					echo "nameserver $dns" >> /tmp/resolv.conf
+				for ns in $dns; do
+					echo "nameserver $ns" >> /tmp/resolv.conf
 				done
 			}
 			
 			env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" &
 		;;
 		dhcp)
-			DHCP_IP=$(nvram get ${2}_ipaddr)
-			DHCP_NETMASK=$(nvram get ${2}_netmask)
+			eval "ip=\"\${${2}_ipaddr}\""
+			eval "netmask=\"\${${2}_netmask}\""
+			eval "hostname=\"\${${2}_hostname}\""
+			
 			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
 	
-			DHCP_ARGS="-i $if ${DHCP_IP:+-r $DHCP_IP} -b -p $pidfile"
-			DHCP_HOSTNAME=$(nvram get ${2}_hostname)
-			DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
-			[ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
-			[ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
-			${DEBUG:-eval} "udhcpc $DHCP_ARGS"
+			args="-i $if ${ip:+-r $ip} -b -p $pidfile"
+			hostname="${hostname%%.*}"
+			args="$args${hostname:+ -H $hostname}"
+			[ "$if_proto" = "pptp" ] && args="$args -n -q" || args="$args -R &"
+			${DEBUG:-eval} "udhcpc $args"
 			# hotplug events are handled by /usr/share/udhcpc/default.script
 		;;
 		*)
@@ -88,25 +86,23 @@ do_ifup() {
 
 do_register()
 {
-	case "${INTERFACE%%[0-9]*}" in
-		eth) setup_eth;;
-	esac
-
 	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && {
 		find_name || {
 			case "${INTERFACE%%[0-9]*}" in
 				wds) 
-					for tmp in lan wifi; do
-						[ -z "$IFPROTO" ] && [ "$(nvram get ${tmp}_ifname)" = "br0" ] && {
-							IFPROTO="$(nvram get ${tmp}_proto)"
+					for ifname in lan wifi; do
+						eval "if=\"\${${ifname}_ifname}\""
+						[ -z "$IFPROTO" ] && [ "$if" = "br0" ] && {
+							eval "IFPROTO=\"\${${2}_proto}\""
 							IFTYPE="${tmp}"
 						}
 					done
 					[ -z "$IFPROTO" ] && return 0
 				;;
 				atm)
-					for tmp in lan wan wifi $(nvram get ifnames); do
-						[ "$(nvram get ${tmp}_proto)" = "pppoa" ] && {
+					for tmp in lan wan wifi ${ifnames}; do
+						eval "if_proto=\"\${${2}_proto}\""
+						[ "$if_proto" = "pppoa" ] && {
 							do_ifup "pppoa" "$tmp" "$INTERFACE"
 							return 0
 						}
@@ -122,16 +118,16 @@ do_register()
 	case "${INTERFACE%%[0-9]*}" in 
 		ppp|atm);;
 		*)
-			mac=$(nvram get ${IFTYPE}_hwaddr)
+			eval "mac=\"\${${IFTYPE}_hwaddr}\""
 			${mac:+$DEBUG ifconfig $INTERFACE down hw ether $mac}
 		;;
 	esac
 
-	if="$(nvram get ${IFTYPE}_ifname)"
+	eval "if=\"\${${IFTYPE}_ifname}\""
 	if [ "${if%%[0-9]}" = "br" ]; then
 		if_valid "$INTERFACE" && {
 			ifconfig "$if" 2>&- >&- || {
-				stp=$(nvram get ${IFTYPE}_stp)
+				eval "stp=\"\${${IFTYPE}_stp}\""
 				$DEBUG brctl addbr "$if"
 				$DEBUG brctl setfd "$if" 0
 				$DEBUG brctl stp "$if" "${stp:-0}"
@@ -151,8 +147,9 @@ do_register()
 }
 
 do_unregister() {
-	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name
-	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0
+	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && {
+		find_name || return 0
+	}
 	
 	[ "${IFACE%%[0-9]*}" = "br" ] && {
 		if [ "$INTERFACE" != "$IFACE" ]; then
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 02fddee7ba..0cc519d8eb 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,14 +1,9 @@
 #!/bin/sh
-. /etc/nvram.sh
-
-[ "$(uname -r|grep -c 2.4)" = "1" ] && {
-        echo "S" > /proc/jffs2_bbc
-}
 
+[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 
-HOSTNAME=$(nvram get wan_hostname)
-HOSTNAME=${HOSTNAME%%.*}
+HOSTNAME=${wan_hostname%%.*}
 echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 
 mkdir -p /var/run
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
deleted file mode 100755
index 168fd2979b..0000000000
--- a/package/base-files/default/etc/init.d/S40network
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-. /etc/functions.sh
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
-case "$1" in
-  start|restart)
-#    ifup lan
-#    ifup wan
-#    ifup wifi
-#    wifi up
-
-    for route in $(nvram get static_route); do {
-      eval "set $(echo $route | sed 's/:/ /g')"
-      $DEBUG route add -net $1 netmask $2 gw $3 metric $4 dev $5
-    } done
-    ;;
-esac
diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
deleted file mode 100755
index 8c67d82b18..0000000000
--- a/package/base-files/default/etc/init.d/S45firewall
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-## Please make changes in /etc/firewall.user
-${FAILSAFE:+exit}
-
-. /etc/functions.sh
-. /etc/network.overrides
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
-
-WAN=$(nvram get wan_ifname)
-LAN=$(nvram get lan_ifname)
-
-## CLEAR TABLES
-for T in filter nat; do
-  iptables -t $T -F
-  iptables -t $T -X
-done
-
-iptables -N input_rule
-iptables -N output_rule
-iptables -N forwarding_rule
-
-iptables -t nat -N prerouting_rule
-iptables -t nat -N postrouting_rule
-
-### INPUT
-###  (connections with the router as destination)
-
-  # base case
-  iptables -P INPUT DROP
-  iptables -A INPUT -m state --state INVALID -j DROP
-  iptables -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
-  iptables -A INPUT -p tcp --tcp-flags SYN SYN --tcp-option \! 2 -j  DROP
-
-  #
-  # insert accept rule or to jump to new accept-check table here
-  #
-  iptables -A INPUT -j input_rule
-
-  # allow
-  iptables -A INPUT ${WAN:+-i \! $WAN}	-j ACCEPT	# allow from lan/wifi interfaces 
-  iptables -A INPUT -p icmp	-j ACCEPT	# allow ICMP
-  iptables -A INPUT -p gre	-j ACCEPT	# allow GRE
-
-  # reject (what to do with anything not allowed earlier)
-  iptables -A INPUT -p tcp -j REJECT --reject-with tcp-reset
-  iptables -A INPUT -j REJECT --reject-with icmp-port-unreachable
-
-### OUTPUT
-### (connections with the router as source)
-
-  # base case
-  iptables -P OUTPUT DROP
-  iptables -A OUTPUT -m state --state INVALID -j DROP
-  iptables -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
-
-  #
-  # insert accept rule or to jump to new accept-check table here
-  #
-  iptables -A OUTPUT -j output_rule
-
-  # allow
-  iptables -A OUTPUT -j ACCEPT		#allow everything out
-
-  # reject (what to do with anything not allowed earlier)
-  iptables -A OUTPUT -p tcp -j REJECT --reject-with tcp-reset
-  iptables -A OUTPUT -j REJECT --reject-with icmp-port-unreachable
-
-### FORWARDING
-### (connections routed through the router)
-
-  # base case
-  iptables -P FORWARD DROP 
-  iptables -A FORWARD -m state --state INVALID -j DROP
-  iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
-  iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
-
-  #
-  # insert accept rule or to jump to new accept-check table here
-  #
-  iptables -A FORWARD -j forwarding_rule
-
-  # allow
-  iptables -A FORWARD -i br0 -o br0 -j ACCEPT
-  [ -z "$WAN" ] || iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT
-
-  # reject (what to do with anything not allowed earlier)
-  # uses the default -P DROP
-
-### MASQ
-  iptables -t nat -A PREROUTING -j prerouting_rule
-  iptables -t nat -A POSTROUTING -j postrouting_rule
-  [ -z "$WAN" ] || iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE
-
-## USER RULES
-[ -f /etc/firewall.user ] && . /etc/firewall.user
diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet
index ff5659ed47..fb9687c8aa 100755
--- a/package/base-files/default/etc/init.d/S50telnet
+++ b/package/base-files/default/etc/init.d/S50telnet
@@ -1,2 +1,2 @@
 #!/bin/sh
-if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null || test $FAILSAFE; then telnetd -l /bin/login; fi
+if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi
diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron
index 6069b8177e..1752734267 100755
--- a/package/base-files/default/etc/init.d/S60cron
+++ b/package/base-files/default/etc/init.d/S60cron
@@ -1,6 +1,4 @@
 #!/bin/sh
-[ -d /etc/crontabs ] || mkdir -p /etc/crontabs
-[ -e /var/spool/cron/crontabs ] || {
-        mkdir -p /var/spool/cron
-        ln -s /etc/crontabs /var/spool/cron/crontabs
-} && crond -c /etc/crontabs
+mkdir -p /var/spool/cron
+ln -s /etc/crontabs /var/spool/cron/crontabs
+crond -c /etc/crontabs
diff --git a/package/base-files/default/etc/init.d/S98done b/package/base-files/default/etc/init.d/S98done
new file mode 100755
index 0000000000..5d5ab49ce3
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S98done
@@ -0,0 +1,9 @@
+#!/bin/sh
+sysctl -p >&-
+
+# automagically run firstboot
+{ mount|grep "on / type tmpfs" 1>&-; } && {
+	lock /tmp/.switch2jffs
+	firstboot switch2jffs
+	lock -u /tmp/.switch2jffs
+}
diff --git a/package/base-files/default/etc/init.d/S99done b/package/base-files/default/etc/init.d/S99done
deleted file mode 100755
index a260ac3d6f..0000000000
--- a/package/base-files/default/etc/init.d/S99done
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# set leds to normal state
-[ -f /proc/sys/diag ] && echo "0x00" > /proc/sys/diag
-sysctl -p >&-
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS
index 10079c5932..b38e449781 100755
--- a/package/base-files/default/etc/init.d/rcS
+++ b/package/base-files/default/etc/init.d/rcS
@@ -1,8 +1,10 @@
 #!/bin/sh
-. /etc/nvram.sh
-syslog_ip=$(nvram get log_ipaddr)
-ipcalc -s "$syslog_ip" || syslog_ip=""
-syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
+${FAILSAFE:+exit}
+
+[ -f /etc/config/network ] && . /etc/config/network
+eval $(ipcalc "$log_ipaddr")
+[ "$log_ipaddr" = "$IP" ] || log_ipaddr=""
+syslogd -C 16 ${log_ipaddr:+-L -R $log_ipaddr}
 klogd
 #${FAILSAFE:+telnetd -l /bin/login; ifup lan; exit}
 for i in /etc/init.d/S*; do
diff --git a/package/base-files/default/etc/inittab b/package/base-files/default/etc/inittab
index 5916311e17..39e134cb16 100644
--- a/package/base-files/default/etc/inittab
+++ b/package/base-files/default/etc/inittab
@@ -1,4 +1,3 @@
 ::sysinit:/etc/init.d/rcS
-::shutdown:/sbin/halt
 tts/0::askfirst:/bin/ash --login
 #tts/1::askfirst:/bin/ash --login
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index ac9039ca71..5b676ca3ac 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -1,24 +1,11 @@
 #!/bin/sh
-. /etc/nvram.sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
-insmod diag
-[ -f /proc/sys/diag ] && echo 0x01 > /proc/sys/diag
-sleep 1
-if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
-	export FAILSAFE=true
-	[ -x /usr/sbin/nvram -a "$(nvram get boot_wait)" != "on" ] && {
-		nvram set boot_wait=on
-		nvram commit
-	}
-	while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
-fi
 
-mount_root ${FAILSAFE:+failsafe}
-
-# automagically run firstboot
-[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
-	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
+[ -f /etc/preinit.arch ] && . /etc/preinit.arch
+[ -z "$FAILSAFE" ] || {
+	echo /bin/true > /proc/sys/kernel/hotplug
+	telnetd -l /bin/login <> /dev/null 2>&1
 }
-
+mount_root ${FAILSAFE:+failsafe}
 exec /sbin/init
-- 
cgit v1.2.3


From b551a8cc105c4fd1bd383e5b95729555386dd86b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openwrt.org>
Date: Mon, 10 Apr 2006 21:54:19 +0000
Subject: check if vim exist, report bye datenmaulwurf

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3611 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/profile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/profile b/package/base-files/default/etc/profile
index e3abe6967f..c42ee4a895 100644
--- a/package/base-files/default/etc/profile
+++ b/package/base-files/default/etc/profile
@@ -5,7 +5,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PS1='\u@\h:\w\$ '
 
 [ -x /usr/bin/less ] || alias less=more
-alias vim=vi
+[ -x /usr/bin/vim ] || alias vim=vi
 
 arp() { cat /proc/net/arp; }
 ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
-- 
cgit v1.2.3


From 7abbf699c23f6e4c092ff44435b318d550a51e50 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 13 Apr 2006 11:39:20 +0000
Subject: Add support for static routes per interface. You can specify one or
 more routes, subnets or hosts. Closes #308 for kamikaze

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3629 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 4bb69378ff..b68ec1be28 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -47,10 +47,22 @@ do_ifup() {
 			eval "netmask=\"\${${2}_netmask}\""
 			eval "gateway=\"\${${2}_gateway}\""
 			eval "dns=\"\${${2}_dns}\""
+			eval "static_route=\"\${${2}_static_route}\""
 	
 			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
 			[ -n "$ip6" ] && $DEBUG ifconfig $if add $ip6
 
+			[ -n "$static_route" ] && {
+				for route in $static_route; do
+					if [ "$(echo $route | cut -d \/ -f2)" != "32" ];
+					then
+						route add -net $(echo $route | cut -d \/ -f1) netmask $(echo $route | cut -d \/ -f1) dev $if
+					else
+						route add -host $(echo $route | cut -d \/ -f1) dev $if
+					fi
+				done
+			}
+
 			${gateway:+$DEBUG route add default gw $gateway}
 	
 			[ -f /tmp/resolv.conf ] || {
-- 
cgit v1.2.3


From a9b90461ebdaeec297893bb2357a5785424f5844 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 10 May 2006 18:17:12 +0000
Subject: add common functions for the new config file format

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3751 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 50 +++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 526ca52dda..858dc286ad 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -11,3 +11,53 @@ if_valid () (
 hotplug_dev() {
 	env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
 }
+
+config_cb() {
+	return 0
+}
+option_cb() {
+	return 0
+}
+
+config () {
+	config_cb "$@"
+	_C=$((${_C:-0} + 1))
+	export CONFIG_SECTION="${2:-cfg${_C}}"
+	export CONFIG_${CONFIG_SECTION}_TYPE="$1"
+}
+
+option () {
+	local varname="$1" ; shift
+	export CONFIG_${CONFIG_SECTION}_${varname}="$*"
+	option_cb "$varname" "$*"
+}
+
+config_clear() {
+	[ -z "$CONFIG_SECTION" ] && return
+	for oldsetting in `set | grep ^CONFIG_${CONFIG_SECTION}_ | \
+		sed -e 's/\(.*\)=.*$/\1/'` ; do 
+		unset $oldsetting 
+	done
+	unset CONFIG_SECTION
+}
+
+config_load() {
+	local CD=""
+	if [ \! -e "$1" -a -e "/etc/config/$1" ]; then
+		cd /etc/config && local CD=1
+	fi
+	[ -e "$1" ] && . $1
+	${CD:+cd - >/dev/null}
+	${CONFIG_SECTION:+config_cb}
+}
+
+config_get() {
+	case "$3" in
+		"") eval "echo \${CONFIG_${1}_${2}}";;
+		*) eval "$1=\"\${CONFIG_${2}_${3}}\"";;
+	esac
+}
+
+config_set() {
+	export CONFIG_${1}_${2}="${3}"
+}
-- 
cgit v1.2.3


From 340f1875ed67c4df30612f9fcd86b6fe9307c77a Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 30 May 2006 19:38:38 +0000
Subject: resync with kamikaze

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3844 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh   | 4 ++++
 package/base-files/default/etc/init.d/S10boot | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 858dc286ad..d54a346315 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -61,3 +61,7 @@ config_get() {
 config_set() {
 	export CONFIG_${1}_${2}="${3}"
 }
+
+load_modules() {
+	sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+}
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 0cc519d8eb..42bb438861 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,4 +1,5 @@
 #!/bin/sh
+. /etc/functions.sh
 
 [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
@@ -16,7 +17,7 @@ for iface in $(/sbin/ifconfig -a | awk '{print $1}' | grep eth); do
 	/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
 done
 
-sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
+load_modules /etc/modules /etc/modules.d/*
 
 ifconfig lo 127.0.0.1 up
 ifconfig eth0 promisc
-- 
cgit v1.2.3


From 705882aaab1526e9c46530c02699c923ec7b80ca Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 15 Jun 2006 17:21:17 +0000
Subject: clean up handling of the root filesystem mount - remove broadcom
 specific junk from the generic base-files part

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3951 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot |  1 +
 package/base-files/default/etc/preinit        | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100755 package/base-files/default/etc/preinit

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 42bb438861..e0d15db0e0 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,6 +1,7 @@
 #!/bin/sh
 . /etc/functions.sh
 
+[ -f /proc/mounts ] || /sbin/mount_root
 [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
deleted file mode 100755
index 5b676ca3ac..0000000000
--- a/package/base-files/default/etc/preinit
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-mount none /proc -t proc
-
-[ -f /etc/preinit.arch ] && . /etc/preinit.arch
-[ -z "$FAILSAFE" ] || {
-	echo /bin/true > /proc/sys/kernel/hotplug
-	telnetd -l /bin/login <> /dev/null 2>&1
-}
-mount_root ${FAILSAFE:+failsafe}
-exec /sbin/init
-- 
cgit v1.2.3


From 5f5b339a140a01ad78645e7182ac959570f6a0d5 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 19 Jun 2006 21:45:07 +0000
Subject: add a list append function to functions.sh

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4014 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index d54a346315..fbb5a160c4 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 alias debug=${DEBUG:-:}
 
+# newline
+N="
+"
+
 # valid interface?
 if_valid () (
   ifconfig "$1" >&- 2>&- ||
@@ -12,6 +16,13 @@ hotplug_dev() {
 	env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
 }
 
+append() {
+	local var="$1"
+	local value="$2"
+	local sep="${3:- }"
+	eval "export ${var}=\"\${${var}:+\${${var}}${value:+$sep}}$value\""
+}
+
 config_cb() {
 	return 0
 }
-- 
cgit v1.2.3


From 52db7da3b4198a15f2c98b297d182a336839b29b Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 25 Jun 2006 15:32:30 +0000
Subject: fixes for common config functions

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4071 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 42 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index fbb5a160c4..e87515d6ea 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -5,6 +5,8 @@ alias debug=${DEBUG:-:}
 N="
 "
 
+_C=0
+
 # valid interface?
 if_valid () (
   ifconfig "$1" >&- 2>&- ||
@@ -23,18 +25,24 @@ append() {
 	eval "export ${var}=\"\${${var}:+\${${var}}${value:+$sep}}$value\""
 }
 
-config_cb() {
-	return 0
-}
-option_cb() {
-	return 0
+reset_cb() {
+	config_cb() {
+		return 0
+	}
+	option_cb() {
+		return 0
+	}
 }
+reset_cb
 
 config () {
-	config_cb "$@"
-	_C=$((${_C:-0} + 1))
-	export CONFIG_SECTION="${2:-cfg${_C}}"
-	export CONFIG_${CONFIG_SECTION}_TYPE="$1"
+	local type="$1"
+	local name="$2"
+	_C=$(($_C + 1))
+	name="${name:-cfg${_C}}"
+	config_cb "$type" "$name"
+	export CONFIG_SECTION="$name"
+	export CONFIG_${CONFIG_SECTION}_TYPE="$type"
 }
 
 option () {
@@ -53,12 +61,16 @@ config_clear() {
 }
 
 config_load() {
-	local CD=""
-	if [ \! -e "$1" -a -e "/etc/config/$1" ]; then
-		cd /etc/config && local CD=1
-	fi
-	[ -e "$1" ] && . $1
-	${CD:+cd - >/dev/null}
+	local DIR="./"
+	_C=0
+	[ \! -e "$1" -a -e "/etc/config/$1" ] && {
+		DIR="/etc/config/"
+	}
+	[ -e "$DIR$1" ] && {
+		CONFIG_FILENAME="$DIR$1"
+		. ${CONFIG_FILENAME}
+	} || return 1
+	${CD:+cd -} >/dev/null
 	${CONFIG_SECTION:+config_cb}
 }
 
-- 
cgit v1.2.3


From 2a5c73861989e8ad3e7498a606bfd7ad9a41559d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 26 Jun 2006 22:44:53 +0000
Subject: don't rely on temporary variables in config() as they may get
 overwritten by config_cb()

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4088 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index e87515d6ea..3010196171 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -36,13 +36,11 @@ reset_cb() {
 reset_cb
 
 config () {
-	local type="$1"
-	local name="$2"
 	_C=$(($_C + 1))
 	name="${name:-cfg${_C}}"
-	config_cb "$type" "$name"
-	export CONFIG_SECTION="$name"
-	export CONFIG_${CONFIG_SECTION}_TYPE="$type"
+	config_cb "$1" "$2"
+	export CONFIG_SECTION="$2"
+	export CONFIG_${CONFIG_SECTION}_TYPE="$1"
 }
 
 option () {
-- 
cgit v1.2.3


From d746a3c00aa26d453d96f4fbba451f30cdc13287 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 27 Jun 2006 00:36:13 +0000
Subject: add copyright headers to base-files scripts and config files

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4090 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh           | 2 ++
 package/base-files/default/etc/hotplug.d/net/10-net   | 2 ++
 package/base-files/default/etc/hotplug.d/usb/01-mount | 3 +++
 package/base-files/default/etc/init.d/S10boot         | 2 ++
 package/base-files/default/etc/init.d/S50httpd        | 2 ++
 package/base-files/default/etc/init.d/S50telnet       | 2 ++
 package/base-files/default/etc/init.d/S60cron         | 2 ++
 package/base-files/default/etc/init.d/S98done         | 2 ++
 package/base-files/default/etc/init.d/rcS             | 2 ++
 package/base-files/default/etc/nvram.sh               | 2 ++
 10 files changed, 21 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 3010196171..a7f7c42e22 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 alias debug=${DEBUG:-:}
 
 # newline
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index b68ec1be28..f306ae342d 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 find_name()
 {
 	for ifname in lan wan wifi ${ifnames}; do
diff --git a/package/base-files/default/etc/hotplug.d/usb/01-mount b/package/base-files/default/etc/hotplug.d/usb/01-mount
index c28ada204e..c4d356b0da 100644
--- a/package/base-files/default/etc/hotplug.d/usb/01-mount
+++ b/package/base-files/default/etc/hotplug.d/usb/01-mount
@@ -1,3 +1,6 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 mount_storage() {
 	cd /dev/discs
 	for dev in disc*; do
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index e0d15db0e0..cb5c6ac4a7 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 . /etc/functions.sh
 
 [ -f /proc/mounts ] || /sbin/mount_root
diff --git a/package/base-files/default/etc/init.d/S50httpd b/package/base-files/default/etc/init.d/S50httpd
index a1b883d0a8..d278519e98 100755
--- a/package/base-files/default/etc/init.d/S50httpd
+++ b/package/base-files/default/etc/init.d/S50httpd
@@ -1,2 +1,4 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 [ -d /www ] && httpd -p 80 -h /www -r OpenWrt
diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet
index fb9687c8aa..25242bdef8 100755
--- a/package/base-files/default/etc/init.d/S50telnet
+++ b/package/base-files/default/etc/init.d/S50telnet
@@ -1,2 +1,4 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi
diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron
index 1752734267..6df9b7dee9 100755
--- a/package/base-files/default/etc/init.d/S60cron
+++ b/package/base-files/default/etc/init.d/S60cron
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 mkdir -p /var/spool/cron
 ln -s /etc/crontabs /var/spool/cron/crontabs
 crond -c /etc/crontabs
diff --git a/package/base-files/default/etc/init.d/S98done b/package/base-files/default/etc/init.d/S98done
index 5d5ab49ce3..a1ea5ad438 100755
--- a/package/base-files/default/etc/init.d/S98done
+++ b/package/base-files/default/etc/init.d/S98done
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 sysctl -p >&-
 
 # automagically run firstboot
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS
index b38e449781..dad989fe09 100755
--- a/package/base-files/default/etc/init.d/rcS
+++ b/package/base-files/default/etc/init.d/rcS
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 ${FAILSAFE:+exit}
 
 [ -f /etc/config/network ] && . /etc/config/network
diff --git a/package/base-files/default/etc/nvram.sh b/package/base-files/default/etc/nvram.sh
index 4d39a10204..ddbd88b52f 100644
--- a/package/base-files/default/etc/nvram.sh
+++ b/package/base-files/default/etc/nvram.sh
@@ -1,4 +1,6 @@
 #!/bin/ash
+# Copyright (C) 2006 OpenWrt.org
+
 
 # allow env to override nvram
 nvram () {
-- 
cgit v1.2.3


From c6d4ef494e01425e9e6057c0b96869f9ba4a26a1 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 17 Jul 2006 09:29:25 +0000
Subject: sync the sysctls with whiterussian, and tune the conntrack timeouts

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4133 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/sysctl.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/sysctl.conf b/package/base-files/default/etc/sysctl.conf
index b09b8cfd9e..e60038cf35 100644
--- a/package/base-files/default/etc/sysctl.conf
+++ b/package/base-files/default/etc/sysctl.conf
@@ -1,8 +1,12 @@
 kernel.panic=3
+net.ipv4.conf.default.arp_ignore=1
+net.ipv4.conf.all.arp_ignore=1
 net.ipv4.ip_forward=1
 net.ipv4.icmp_echo_ignore_broadcasts=1
 net.ipv4.icmp_ignore_bogus_error_responses=1
 net.ipv4.tcp_fin_timeout=30
 net.ipv4.tcp_keepalive_time=120
+net.ipv4.tcp_syncookies=1
 net.ipv4.tcp_timestamps=0
-net.ipv4.tcp_vegas_cong_avoid=1
+net.ipv4.ip_conntrack_tcp_timeouts="300 43200 120 60 120 120 10 60 30 120"
+net.ipv4.ip_conntrack_udp_timeouts="60 180"
-- 
cgit v1.2.3


From f15e613e2b69c565ec5b43ca4e1bd9f8fe5dda74 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 25 Jul 2006 18:12:30 +0000
Subject: use 127.0.0.1 as dns server and point dnsmasq to /tmp/resolv.conf

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4282 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/resolv.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/base-files/default/etc/resolv.conf

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/resolv.conf b/package/base-files/default/etc/resolv.conf
new file mode 100644
index 0000000000..9617eacda7
--- /dev/null
+++ b/package/base-files/default/etc/resolv.conf
@@ -0,0 +1,2 @@
+nameserver 127.0.0.1
+search lan
-- 
cgit v1.2.3


From 85b8f04fac05a84225d56e0b8b60a6427417164d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 29 Jul 2006 19:59:45 +0000
Subject: fix unnamed config sections

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4321 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index a7f7c42e22..03fd23807a 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
 
 alias debug=${DEBUG:-:}
 
@@ -38,15 +39,17 @@ reset_cb() {
 reset_cb
 
 config () {
-	_C=$(($_C + 1))
-	name="${name:-cfg${_C}}"
-	config_cb "$1" "$2"
-	export CONFIG_SECTION="$2"
-	export CONFIG_${CONFIG_SECTION}_TYPE="$1"
+    local type="$1"
+    local name="$2"
+    _C=$(($_C + 1))
+    name="${name:-cfg${_C}}"
+    config_cb "$type" "$name"
+    export CONFIG_SECTION="$name"
+    export CONFIG_${CONFIG_SECTION}_TYPE="$type"
 }
 
 option () {
-	local varname="$1" ; shift
+	local varname="$1"; shift
 	export CONFIG_${CONFIG_SECTION}_${varname}="$*"
 	option_cb "$varname" "$*"
 }
@@ -88,3 +91,9 @@ config_set() {
 load_modules() {
 	sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
 }
+
+include() {
+	for file in $(ls /lib/$1/*.sh 2>/dev/null); do
+		. $file
+	done
+}
-- 
cgit v1.2.3


From d5aeb2645530079ac89ed72e2eee91fbcbc38e84 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 29 Jul 2006 20:25:55 +0000
Subject: avoid using a reserved word as a variable name

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4322 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 03fd23807a..27b0a6d5fc 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -39,13 +39,13 @@ reset_cb() {
 reset_cb
 
 config () {
-    local type="$1"
+    local cfgtype="$1"
     local name="$2"
     _C=$(($_C + 1))
     name="${name:-cfg${_C}}"
-    config_cb "$type" "$name"
+    config_cb "$cfgtype" "$name"
     export CONFIG_SECTION="$name"
-    export CONFIG_${CONFIG_SECTION}_TYPE="$type"
+    export CONFIG_${CONFIG_SECTION}_TYPE="$cfgtype"
 }
 
 option () {
-- 
cgit v1.2.3


From d3a6fe9915875cb78ca3d22f8330a0380dcd58a0 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 30 Jul 2006 03:09:09 +0000
Subject: rewrite of the network scripts and configuration

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4323 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../base-files/default/etc/hotplug.d/net/10-net    | 201 ++-------------------
 package/base-files/default/etc/init.d/S10boot      |   3 +-
 package/base-files/default/etc/init.d/S40network   |   9 +
 package/base-files/default/etc/init.d/rcS          |  11 +-
 4 files changed, 36 insertions(+), 188 deletions(-)
 create mode 100755 package/base-files/default/etc/init.d/S40network

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index f306ae342d..d5b7f6b0fa 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,191 +1,28 @@
-#!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
-find_name()
-{
-	for ifname in lan wan wifi ${ifnames}; do
-		IFTYPE="${ifname}"
-		eval "IFPROTO=\"\${${IFTYPE}_proto}\""
-		eval "IFACE=\"\${${IFTYPE}_ifname}\""
-		case "$IFPROTO" in
-			""|none);;
-			static|dhcp)
-				[ "${IFACE}" = "$INTERFACE" ] && return 0
-				[ "${IFACE%%[0-9]*}" = "br" ] && {
-					eval "ifs=\"\${${IFTYPE}_ifnames}\""
-					for part in $ifs; do
-						[ "$part" = "$INTERFACE" ] && return 0
-					done
-				}
-			;;
-			pppoa)
-				[ "$INTERFACE" = "atm0" \
-				  -a -x /sbin/ifup.${IFPROTO} ] && return 0
-			;;
-			*)
-				eval "device=\"\${${IFTYPE}_device}\""
-				[ "$device" = "$INTERFACE" \
-				  -a -x /sbin/ifup.${IFPROTO} ] && return 0
-			;;
-		esac
-	done
-	IFACE=""
-	IFTYPE=""
-	IFPROTO=""
-	return 255
-}
-
-do_ifup() {
-	if="$3"
-	eval "if_proto=\"\${${2}_proto}\""
-	
-	pidfile=/var/run/${if}.pid
-	[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
-
-	case "$1" in
-		static)
-			eval "ip=\"\${${2}_ipaddr}\""
-			eval "ip6=\"\${${2}_ip6addr}\""
-			eval "netmask=\"\${${2}_netmask}\""
-			eval "gateway=\"\${${2}_gateway}\""
-			eval "dns=\"\${${2}_dns}\""
-			eval "static_route=\"\${${2}_static_route}\""
-	
-			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
-			[ -n "$ip6" ] && $DEBUG ifconfig $if add $ip6
-
-			[ -n "$static_route" ] && {
-				for route in $static_route; do
-					if [ "$(echo $route | cut -d \/ -f2)" != "32" ];
-					then
-						route add -net $(echo $route | cut -d \/ -f1) netmask $(echo $route | cut -d \/ -f1) dev $if
-					else
-						route add -host $(echo $route | cut -d \/ -f1) dev $if
-					fi
-				done
-			}
+include network
 
-			${gateway:+$DEBUG route add default gw $gateway}
+addif() {
+	scan_interfaces
+	setup_interface "$INTERFACE"
 	
-			[ -f /tmp/resolv.conf ] || {
-				debug "# --- creating /tmp/resolv.conf ---"
-				for ns in $dns; do
-					echo "nameserver $ns" >> /tmp/resolv.conf
-				done
-			}
-			
-			env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" &
-		;;
-		dhcp)
-			eval "ip=\"\${${2}_ipaddr}\""
-			eval "netmask=\"\${${2}_netmask}\""
-			eval "hostname=\"\${${2}_hostname}\""
-			
-			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
-	
-			args="-i $if ${ip:+-r $ip} -b -p $pidfile"
-			hostname="${hostname%%.*}"
-			args="$args${hostname:+ -H $hostname}"
-			[ "$if_proto" = "pptp" ] && args="$args -n -q" || args="$args -R &"
-			${DEBUG:-eval} "udhcpc $args"
-			# hotplug events are handled by /usr/share/udhcpc/default.script
-		;;
-		*)
-			if [ -x "/sbin/ifup.$1" ]; then
-				( $DEBUG . /sbin/ifup.$1 ${2} $3 )
-			fi
-		;;
-	esac
-}
-
-do_register()
-{
-	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && {
-		find_name || {
-			case "${INTERFACE%%[0-9]*}" in
-				wds) 
-					for ifname in lan wifi; do
-						eval "if=\"\${${ifname}_ifname}\""
-						[ -z "$IFPROTO" ] && [ "$if" = "br0" ] && {
-							eval "IFPROTO=\"\${${2}_proto}\""
-							IFTYPE="${tmp}"
-						}
-					done
-					[ -z "$IFPROTO" ] && return 0
-				;;
-				atm)
-					for tmp in lan wan wifi ${ifnames}; do
-						eval "if_proto=\"\${${2}_proto}\""
-						[ "$if_proto" = "pppoa" ] && {
-							do_ifup "pppoa" "$tmp" "$INTERFACE"
-							return 0
-						}
-					done
-				;;
-				*)
-					return 0
-				;;
-			esac
-		}
-	}
-
-	case "${INTERFACE%%[0-9]*}" in 
-		ppp|atm);;
-		*)
-			eval "mac=\"\${${IFTYPE}_hwaddr}\""
-			${mac:+$DEBUG ifconfig $INTERFACE down hw ether $mac}
-		;;
-	esac
-
-	eval "if=\"\${${IFTYPE}_ifname}\""
-	if [ "${if%%[0-9]}" = "br" ]; then
-		if_valid "$INTERFACE" && {
-			ifconfig "$if" 2>&- >&- || {
-				eval "stp=\"\${${IFTYPE}_stp}\""
-				$DEBUG brctl addbr "$if"
-				$DEBUG brctl setfd "$if" 0
-				$DEBUG brctl stp "$if" "${stp:-0}"
+	# find all vlan configurations for this interface and set them up as well
+	for ifc in $interfaces; do
+		config_get type "$ifc" type
+		case "$type" in
+			bridge) config_get ifs "$ifc" ifnames;;
+			*) config_get ifs "$ifc" ifname;;
+		esac
+		for dev in $ifs; do
+			[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
+				add_vlan "$dev"
 			}
-
-			if [ "$INTERFACE" != "$if" ]; then
-				$DEBUG ifconfig "$INTERFACE" 0.0.0.0 up
-				$DEBUG brctl addif "$if" "$INTERFACE"
-				$DEBUG ifconfig "$INTERFACE" allmulti
-			else
-				do_ifup "$IFPROTO" "$IFTYPE" "$if"
-			fi
-		}
-	else 
-		[ "${INTERFACE%%[0-9]*}" = "ppp" ] || do_ifup "$IFPROTO" "$IFTYPE" "$if"
-	fi
-}
-
-do_unregister() {
-	[ -z "$IFTYPE" -o -z "$IFPROTO" ] && {
-		find_name || return 0
-	}
-	
-	[ "${IFACE%%[0-9]*}" = "br" ] && {
-		if [ "$INTERFACE" != "$IFACE" ]; then
-			brctl delif "$IFACE" "$INTERFACE" 2>&- >&-
-		else
-			brctl delbr "$IFACE" 2>&- >&-
-		fi
-	}
-	
-	case "$IFPROTO" in
-		pppoe|pppoa|pptp) 
-			killall pppd 2>&- >&-
-		;;
-		dhcp)
-			[ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&-
-		;;
-	esac
-
-	[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
+		done
+	done
 }
 
 case "$ACTION" in
-	add|register) do_register;;
-	remove|unregister) do_unregister;;
+	add|register)
+		addif
+	;;
 esac
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index cb5c6ac4a7..19420eda53 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -5,13 +5,14 @@
 
 [ -f /proc/mounts ] || /sbin/mount_root
 [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
-vconfig set_name_type VLAN_PLUS_VID_NO_PAD
+vconfig set_name_type DEV_PLUS_VID_NO_PAD
 
 HOSTNAME=${wan_hostname%%.*}
 echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 
 mkdir -p /var/run
 mkdir -p /var/log
+mkdir -p /var/lock
 touch /var/log/wtmp
 touch /var/log/lastlog
 [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
new file mode 100755
index 0000000000..20a11845b6
--- /dev/null
+++ b/package/base-files/default/etc/init.d/S40network
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.orga
+
+setup_switch() { return 0; }
+
+. /etc/functions.sh
+include network
+setup_switch
+/sbin/wifi
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS
index dad989fe09..2aa70910c3 100755
--- a/package/base-files/default/etc/init.d/rcS
+++ b/package/base-files/default/etc/init.d/rcS
@@ -3,12 +3,13 @@
 
 ${FAILSAFE:+exit}
 
-[ -f /etc/config/network ] && . /etc/config/network
-eval $(ipcalc "$log_ipaddr")
-[ "$log_ipaddr" = "$IP" ] || log_ipaddr=""
-syslogd -C 16 ${log_ipaddr:+-L -R $log_ipaddr}
+# FIXME: add logging configuration
+#[ -f /etc/config/network ] && . /etc/config/network
+#eval $(ipcalc "$log_ipaddr")
+#[ "$log_ipaddr" = "$IP" ] || log_ipaddr=""
+syslogd -C 16 #${log_ipaddr:+-L -R $log_ipaddr}
 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 '' &
-- 
cgit v1.2.3


From 165859eefe99136ad60c25f328bb10612200c269 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 30 Jul 2006 13:21:18 +0000
Subject: fix more instances of '' abuse

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4326 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index d5b7f6b0fa..72146a1d78 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -8,8 +8,8 @@ addif() {
 	
 	# find all vlan configurations for this interface and set them up as well
 	for ifc in $interfaces; do
-		config_get type "$ifc" type
-		case "$type" in
+		config_get iftype "$ifc" type
+		case "$iftype" in
 			bridge) config_get ifs "$ifc" ifnames;;
 			*) config_get ifs "$ifc" ifname;;
 		esac
-- 
cgit v1.2.3


From 5386c561642d36a52b1eaeab1e8ad081b3cb13b4 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 1 Aug 2006 23:19:54 +0000
Subject: fix typo

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4386 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S40network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index 20a11845b6..ec290335db 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.orga
+# Copyright (C) 2006 OpenWrt.org
 
 setup_switch() { return 0; }
 
-- 
cgit v1.2.3


From fd33bd769e54fb99093d659bb5803f77ccf8d258 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 24 Aug 2006 12:20:02 +0000
Subject: fix remaining *_ifnames references

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4650 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 72146a1d78..8661a2851d 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -5,14 +5,11 @@ include network
 addif() {
 	scan_interfaces
 	setup_interface "$INTERFACE"
-	
+
 	# find all vlan configurations for this interface and set them up as well
 	for ifc in $interfaces; do
 		config_get iftype "$ifc" type
-		case "$iftype" in
-			bridge) config_get ifs "$ifc" ifnames;;
-			*) config_get ifs "$ifc" ifname;;
-		esac
+		config_get ifs "$ifc" ifname
 		for dev in $ifs; do
 			[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
 				add_vlan "$dev"
-- 
cgit v1.2.3


From 579883fabc0f968c22993ba8df22aa4309597cba Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 24 Aug 2006 13:46:47 +0000
Subject: revert to using *_ifnames internally, too many problems with
 firewall, ppp, etc. otherwise

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4653 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 8661a2851d..b5140758af 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -9,7 +9,10 @@ addif() {
 	# find all vlan configurations for this interface and set them up as well
 	for ifc in $interfaces; do
 		config_get iftype "$ifc" type
-		config_get ifs "$ifc" ifname
+		case "$iftype" in
+			bridge) config_get ifs "$ifc" ifnames;;
+			*) config_get ifs "$ifc" ifname;;
+		esac
 		for dev in $ifs; do
 			[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
 				add_vlan "$dev"
-- 
cgit v1.2.3


From b659e450d0ca71f591f3f94ecfa8fd269f1894c1 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Sat, 26 Aug 2006 01:04:43 +0000
Subject: clean up hotplug mounting scripts

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4673 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../default/etc/hotplug.d/block/01-mount           | 26 +++++++++++
 package/base-files/default/etc/hotplug.d/usb/01-ln | 33 ++++++++++++++
 .../base-files/default/etc/hotplug.d/usb/01-mount  | 52 ----------------------
 3 files changed, 59 insertions(+), 52 deletions(-)
 create mode 100755 package/base-files/default/etc/hotplug.d/block/01-mount
 create mode 100755 package/base-files/default/etc/hotplug.d/usb/01-ln
 delete mode 100644 package/base-files/default/etc/hotplug.d/usb/01-mount

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/block/01-mount b/package/base-files/default/etc/hotplug.d/block/01-mount
new file mode 100755
index 0000000000..b6275e5a28
--- /dev/null
+++ b/package/base-files/default/etc/hotplug.d/block/01-mount
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+DEV=${DEVPATH##*/}
+{
+echo "ACTION=$ACTION DEVPATH=$DEVPATH $0 $*"
+case "$ACTION" in
+add)
+	echo -ne "waiting for $DEV"
+	while [ ! -b /dev/$DEV ]; do {
+		echo -ne "."
+		sleep 1
+		time=$((time+1)); [ $time -gt 10 ] && break
+	}; done
+	
+	[ ${DEV%%[0-9]} != ${DEV} ] && {
+		mkdir -p /tmp/$DEV
+		mount /dev/$DEV /tmp/$DEV -t auto -o sync
+	}
+	;;
+remove)
+	umount /tmp/$DEV
+	rm -rf /dev/$DEV /tmp/$DEV
+	;;
+esac
+} 2>&1 | logger
diff --git a/package/base-files/default/etc/hotplug.d/usb/01-ln b/package/base-files/default/etc/hotplug.d/usb/01-ln
new file mode 100755
index 0000000000..f9eda02988
--- /dev/null
+++ b/package/base-files/default/etc/hotplug.d/usb/01-ln
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+case "$ACTION" in
+add) 
+	[ -f /sys/${DEVPATH}/idVendor -a "$(cat /sys/${DEVPATH}/idVendor)" -ne "0000" ] && {
+		cd /sys/${DEVPATH}
+
+		NUM=${DEVPATH##*/}
+		HOST=$(find ${NUM}:*/host* -type d)
+		HOST=${HOST##*/host}
+
+		echo -ne "waiting for disk"
+
+		while [ ! -d "/dev/scsi/host${HOST}/bus0/target0/lun0" ]; do {
+			echo -ne "."
+			sleep 1;
+			time=$((time+1)); [ $time -gt 10 ] && break
+		}; done
+		echo
+		
+		cd  /sys/bus/scsi/devices/${HOST}\:0\:0\:0
+		for BLOCK in block:* ; do {
+			cd ${BLOCK}
+			BLOCK=${BLOCK##block\:}
+			ln -sf /dev/scsi/host${HOST}/bus0/target0/lun0/disc /dev/${BLOCK} 
+			for DEV in ${BLOCK}*; do {
+				ln -sf /dev/scsi/host${HOST}/bus0/target0/lun0/part${DEV##$BLOCK} /dev/$DEV
+			}; done
+		}; done
+	} 2>&1 | logger 
+	;;
+esac
diff --git a/package/base-files/default/etc/hotplug.d/usb/01-mount b/package/base-files/default/etc/hotplug.d/usb/01-mount
deleted file mode 100644
index c4d356b0da..0000000000
--- a/package/base-files/default/etc/hotplug.d/usb/01-mount
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
-mount_storage() {
-	cd /dev/discs
-	for dev in disc*; do
-		[ -f /tmp/.${dev}_id ] || {
-			echo ${INTERFACE}${PRODUCT} > /tmp/.${dev}_id
-			mount | grep /mnt/${dev} || (
-				[ -d /mnt/. ] || {
-					mkdir -p /tmp/mnt
-					ln -s /tmp/mnt /
-				}
-				cd $dev
-				for part in part*; do
-					path=/mnt/${dev}_${part##*part}
-					mkdir -p ${path}
-					mount ${part} ${path}
-				done
-			)
-		}
-	done
-}
-
-umount_storage() {
-	for tmp in /tmp/.*_id; do
-		id=$(cat $tmp 2>&-)
-		[ "${INTERFACE}${PRODUCT}" = "$id" ] && {
-			rm -f $tmp
-			disc=${tmp##*disc}
-			disc=${disc%%_id}
-			for disc in /mnt/disc${disc}*; do
-				umount -f $disc || umount -l $disc
-			done
-		}
-	done
-}
-
-[ -f /proc/bus/usb/devices ] || mount -t usbfs none /proc/bus/usb
-
-case "$ACTION" in
-	add)
-		case "${INTERFACE%%/*}" in
-			8) mount_storage ;;
-		esac
-	;;
-	remove)
-		case "${INTERFACE%%/*}" in
-			8) umount_storage ;;
-		esac
-	;;
-esac
-- 
cgit v1.2.3


From baef996bf0625f08654c76a7b0a0494cb1d83654 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Sun, 27 Aug 2006 11:11:55 +0000
Subject: fix minor typo & move loopback to network config

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4683 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 19420eda53..34f4cea934 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -22,7 +22,3 @@ for iface in $(/sbin/ifconfig -a | awk '{print $1}' | grep eth); do
 done
 
 load_modules /etc/modules /etc/modules.d/*
-
-ifconfig lo 127.0.0.1 up
-ifconfig eth0 promisc
-
-- 
cgit v1.2.3


From 596ac42047b67352e38b1a842bb766caefec940e Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Sun, 27 Aug 2006 11:22:56 +0000
Subject: change hotplug trigger to a simpler awk command

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4685 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 34f4cea934..b361e156fe 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -17,7 +17,8 @@ touch /var/log/wtmp
 touch /var/log/lastlog
 [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
-for iface in $(/sbin/ifconfig -a | awk '{print $1}' | grep eth); do
+# manually trigger hotplug before loading modules
+for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
 	/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
 done
 
-- 
cgit v1.2.3


From 89e49bef8a9b15f597f10e8a269c52a835201201 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 30 Aug 2006 04:08:35 +0000
Subject: add default /etc/config/network

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4706 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/config/network | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 package/base-files/default/etc/config/network

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/config/network b/package/base-files/default/etc/config/network
new file mode 100644
index 0000000000..60c2da12c5
--- /dev/null
+++ b/package/base-files/default/etc/config/network
@@ -0,0 +1,5 @@
+config interface lan
+	option ifname	eth0
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
-- 
cgit v1.2.3


From d5fa051bb7f1c0ef271bef3ec8b0f7881a567368 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Thu, 7 Sep 2006 17:40:28 +0000
Subject: change more to less

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4774 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/profile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/profile b/package/base-files/default/etc/profile
index c42ee4a895..ae514b0924 100644
--- a/package/base-files/default/etc/profile
+++ b/package/base-files/default/etc/profile
@@ -4,7 +4,7 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PS1='\u@\h:\w\$ '
 
-[ -x /usr/bin/less ] || alias less=more
+alias more=less
 [ -x /usr/bin/vim ] || alias vim=vi
 
 arp() { cat /proc/net/arp; }
-- 
cgit v1.2.3


From 3b6a5de9580e77b494392fee2e4681ce785415b4 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Fri, 15 Sep 2006 22:25:03 +0000
Subject: bring up loopback by default

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4793 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/config/network | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/config/network b/package/base-files/default/etc/config/network
index 60c2da12c5..1d5ded3728 100644
--- a/package/base-files/default/etc/config/network
+++ b/package/base-files/default/etc/config/network
@@ -1,3 +1,11 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
 config interface lan
 	option ifname	eth0
 	option proto	static
-- 
cgit v1.2.3


From 57c6e6b156f6e37071ca2e0c06d5794ed032d1cc Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 24 Sep 2006 13:32:18 +0000
Subject: use absolute paths in include() shell function

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4852 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh         | 2 +-
 package/base-files/default/etc/hotplug.d/net/10-net | 2 +-
 package/base-files/default/etc/init.d/S40network    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 27b0a6d5fc..ce22ed151c 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -93,7 +93,7 @@ load_modules() {
 }
 
 include() {
-	for file in $(ls /lib/$1/*.sh 2>/dev/null); do
+	for file in $(ls $1/*.sh 2>/dev/null); do
 		. $file
 	done
 }
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index b5140758af..0a24b052f3 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,6 +1,6 @@
 # Copyright (C) 2006 OpenWrt.org
 
-include network
+include /lib/network
 
 addif() {
 	scan_interfaces
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index ec290335db..f2c3e22859 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -4,6 +4,6 @@
 setup_switch() { return 0; }
 
 . /etc/functions.sh
-include network
+include /lib/network
 setup_switch
 /sbin/wifi
-- 
cgit v1.2.3


From 3aa127d7a54c3486f103560b3f872a106b1bee34 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 Oct 2006 20:05:48 +0000
Subject: add new rc.common for standardized init scripts, convert existing
 init scripts

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4915 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/init.d/S10boot    | 46 +++++++-------
 package/base-files/default/etc/init.d/S40network | 14 +++--
 package/base-files/default/etc/init.d/S50httpd   | 10 ++-
 package/base-files/default/etc/init.d/S50telnet  | 10 ++-
 package/base-files/default/etc/init.d/S60cron    | 14 +++--
 package/base-files/default/etc/init.d/S98done    | 11 ----
 package/base-files/default/etc/init.d/rcS        | 17 +++++-
 package/base-files/default/etc/rc.common         | 77 ++++++++++++++++++++++++
 8 files changed, 148 insertions(+), 51 deletions(-)
 delete mode 100755 package/base-files/default/etc/init.d/S98done
 create mode 100755 package/base-files/default/etc/rc.common

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index b361e156fe..77b5ca72d5 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,25 +1,25 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-. /etc/functions.sh
-
-[ -f /proc/mounts ] || /sbin/mount_root
-[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
-vconfig set_name_type DEV_PLUS_VID_NO_PAD
-
-HOSTNAME=${wan_hostname%%.*}
-echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
-
-mkdir -p /var/run
-mkdir -p /var/log
-mkdir -p /var/lock
-touch /var/log/wtmp
-touch /var/log/lastlog
-[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
-
-# manually trigger hotplug before loading modules
-for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
-	/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
-done
-
-load_modules /etc/modules /etc/modules.d/*
+start() {
+	[ -f /proc/mounts ] || /sbin/mount_root
+	[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
+	vconfig set_name_type DEV_PLUS_VID_NO_PAD
+	
+	HOSTNAME=${wan_hostname%%.*}
+	echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
+	
+	mkdir -p /var/run
+	mkdir -p /var/log
+	mkdir -p /var/lock
+	touch /var/log/wtmp
+	touch /var/log/lastlog
+	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
+	
+	# manually trigger hotplug before loading modules
+	for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
+		/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
+	done
+	
+	load_modules /etc/modules /etc/modules.d/*
+}
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index f2c3e22859..be045045e7 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -1,9 +1,11 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-setup_switch() { return 0; }
+start() {
+	setup_switch() { return 0; }
+
+	include /lib/network
+	setup_switch
+	/sbin/wifi
+}
 
-. /etc/functions.sh
-include /lib/network
-setup_switch
-/sbin/wifi
diff --git a/package/base-files/default/etc/init.d/S50httpd b/package/base-files/default/etc/init.d/S50httpd
index d278519e98..a05b10c094 100755
--- a/package/base-files/default/etc/init.d/S50httpd
+++ b/package/base-files/default/etc/init.d/S50httpd
@@ -1,4 +1,10 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-[ -d /www ] && httpd -p 80 -h /www -r OpenWrt
+start() {
+	[ -d /www ] && httpd -p 80 -h /www -r OpenWrt
+}
+
+stop() {
+	killall httpd
+}
diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet
index 25242bdef8..228eac2b62 100755
--- a/package/base-files/default/etc/init.d/S50telnet
+++ b/package/base-files/default/etc/init.d/S50telnet
@@ -1,4 +1,10 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi
+start() {
+	if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi
+}
+
+stop() {
+	killall telnetd
+}
diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron
index 6df9b7dee9..a450c36dd2 100755
--- a/package/base-files/default/etc/init.d/S60cron
+++ b/package/base-files/default/etc/init.d/S60cron
@@ -1,6 +1,12 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-mkdir -p /var/spool/cron
-ln -s /etc/crontabs /var/spool/cron/crontabs
-crond -c /etc/crontabs
+start () {
+	mkdir -p /var/spool/cron
+	ln -s /etc/crontabs /var/spool/cron/crontabs
+	crond -c /etc/crontabs
+}
+
+stop() {
+	killall crond
+}
diff --git a/package/base-files/default/etc/init.d/S98done b/package/base-files/default/etc/init.d/S98done
deleted file mode 100755
index a1ea5ad438..0000000000
--- a/package/base-files/default/etc/init.d/S98done
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
-sysctl -p >&-
-
-# automagically run firstboot
-{ mount|grep "on / type tmpfs" 1>&-; } && {
-	lock /tmp/.switch2jffs
-	firstboot switch2jffs
-	lock -u /tmp/.switch2jffs
-}
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS
index 2aa70910c3..7fae7f5b05 100755
--- a/package/base-files/default/etc/init.d/rcS
+++ b/package/base-files/default/etc/init.d/rcS
@@ -10,6 +10,17 @@ ${FAILSAFE:+exit}
 syslogd -C 16 #${log_ipaddr:+-L -R $log_ipaddr}
 klogd
 
-for i in /etc/init.d/S*; do
-  $i start 2>&1
-done | logger -s -p 6 -t '' &
+(
+	for i in /etc/init.d/S*; do
+		$i start 2>&1
+	done 
+	
+	sysctl -p >&-
+
+	# automagically run firstboot
+	{ mount|grep "on / type tmpfs" 1>&-; } && {
+		lock /tmp/.switch2jffs
+		firstboot switch2jffs
+		lock -u /tmp/.switch2jffs
+	}
+) | logger -s -p 6 -t '' &
diff --git a/package/base-files/default/etc/rc.common b/package/base-files/default/etc/rc.common
new file mode 100755
index 0000000000..4a90a25b18
--- /dev/null
+++ b/package/base-files/default/etc/rc.common
@@ -0,0 +1,77 @@
+#!/bin/sh
+. /etc/functions.sh
+
+start() {
+	return 0
+}
+
+stop() {
+	return 0
+}
+
+reload() {
+	return 1
+}
+
+restart() {
+	stop
+	start
+}
+
+boot() {
+	start
+}
+
+shutdown() {
+	return 0
+}
+
+disable() {
+	rm -f /etc/rc.d/${initscript##*/}
+}
+
+enable() {
+	disable
+	ln -s /etc/init.d/${initscript##*/} /etc/rc.d/${initscript##*/}
+}
+
+depends() {
+	return 0
+}
+
+help() {
+	cat <<EOF
+Syntax: $0 [command]
+
+Available commands:
+	start	Start the service
+	stop	Stop the service
+	restart	Restart the service
+	reload	Reload configuration files (or restart if that fails)
+	enable	Enable the service (load at boot time)
+	disable	Disable the service
+$EXTRA_HELP
+EOF
+}
+
+initscript="$1"
+action="$2"
+
+. "$initscript"
+
+cmds=
+for cmd in $EXTRA_COMMANDS; do
+	cmds="$cmd) $cmd;;"
+done
+eval "case \"\$action\" in
+	start) start;;
+	stop) stop;;
+	reload) reload || restart;;
+	restart) restart;;
+	enable) enable;;
+	disable) disable;;
+	boot) boot;;
+	shutdown) shutdown;;
+	$cmds
+	*) help;;
+esac"
-- 
cgit v1.2.3


From 0611c7a036cda2d996f9f953584a8e14a92032fd Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 Oct 2006 20:09:14 +0000
Subject: fix displayed name in init script help text

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4916 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/rc.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/rc.common b/package/base-files/default/etc/rc.common
index 4a90a25b18..667627862f 100755
--- a/package/base-files/default/etc/rc.common
+++ b/package/base-files/default/etc/rc.common
@@ -41,7 +41,7 @@ depends() {
 
 help() {
 	cat <<EOF
-Syntax: $0 [command]
+Syntax: $initscript [command]
 
 Available commands:
 	start	Start the service
-- 
cgit v1.2.3


From bb91b8c2fa2fb3fd2ff248e2b3626bc333bd5eff Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 Oct 2006 22:46:17 +0000
Subject: hide enable/disable functions, not active yet

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4921 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/rc.common | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/rc.common b/package/base-files/default/etc/rc.common
index 667627862f..20d1efa402 100755
--- a/package/base-files/default/etc/rc.common
+++ b/package/base-files/default/etc/rc.common
@@ -48,8 +48,6 @@ Available commands:
 	stop	Stop the service
 	restart	Restart the service
 	reload	Reload configuration files (or restart if that fails)
-	enable	Enable the service (load at boot time)
-	disable	Disable the service
 $EXTRA_HELP
 EOF
 }
@@ -68,8 +66,6 @@ eval "case \"\$action\" in
 	stop) stop;;
 	reload) reload || restart;;
 	restart) restart;;
-	enable) enable;;
-	disable) disable;;
 	boot) boot;;
 	shutdown) shutdown;;
 	$cmds
-- 
cgit v1.2.3


From 4ec2bfc56e86bc6929da64706d129db1e39fb229 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 9 Oct 2006 04:01:36 +0000
Subject: add 1 second delay for natsemi ifup (sometimes won't come up
 otherwise)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4980 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 0a24b052f3..176b9372f4 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -23,6 +23,9 @@ addif() {
 
 case "$ACTION" in
 	add|register)
+		case "$PHYSDEVDRIVER" in
+			natsemi) sleep 1;;
+		esac
 		addif
 	;;
 esac
-- 
cgit v1.2.3


From d30dc59b745b1a3d0c455ef7fe388750abb5c9ab Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 9 Oct 2006 04:29:27 +0000
Subject: fix shell escaping bug in append() function

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4981 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index ce22ed151c..2ce172eb35 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -25,7 +25,7 @@ append() {
 	local var="$1"
 	local value="$2"
 	local sep="${3:- }"
-	eval "export ${var}=\"\${${var}:+\${${var}}${value:+$sep}}$value\""
+	eval "export ${var}=\"\${${var}:+\${${var}}${value:+$sep}}\$value\""
 }
 
 reset_cb() {
-- 
cgit v1.2.3


From 5797c34cf477d45cf842bbb32a5f70ddbde6d37c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 9 Oct 2006 05:59:26 +0000
Subject: add new /bin/uci script and api for manipulating buildroot-ng config
 files

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4982 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/functions.sh | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 2ce172eb35..9c3057ed00 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -54,6 +54,26 @@ option () {
 	option_cb "$varname" "$*"
 }
 
+config_rename() {
+	local OLD="$1"
+	local NEW="$2"
+	local oldsetting
+	local newvar
+	
+	[ -z "$OLD" -o -z "$NEW" ] && return
+	for oldsetting in `set | grep ^CONFIG_${OLD}_ | \
+		sed -e 's/\(.*\)=.*$/\1/'` ; do
+		newvar="CONFIG_${NEW}_${oldsetting##CONFIG_${OLD}_}"
+		eval "${newvar}=\${$oldsetting}"
+		unset "$oldsetting"
+	done
+	[ "$CONFIG_SECTION" = "$OLD" ] && CONFIG_SECTION="$NEW"
+}
+
+config_unset() {
+	config_set "$1" "$2" ""
+}
+
 config_clear() {
 	[ -z "$CONFIG_SECTION" ] && return
 	for oldsetting in `set | grep ^CONFIG_${CONFIG_SECTION}_ | \
@@ -79,7 +99,7 @@ config_load() {
 
 config_get() {
 	case "$3" in
-		"") eval "echo \${CONFIG_${1}_${2}}";;
+		"") eval "echo \"\${CONFIG_${1}_${2}}\"";;
 		*) eval "$1=\"\${CONFIG_${2}_${3}}\"";;
 	esac
 }
-- 
cgit v1.2.3


From 2b68446157854a58f14e7bf76a1988d9d98c62bd Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 9 Oct 2006 12:35:31 +0000
Subject: save the real configured interface name in the 'device' variable when
 running scan_interfaces() - fixes pppoe problems

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4983 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/default/etc/hotplug.d/net/10-net | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'package/base-files/default/etc')

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 176b9372f4..4e5c3041b5 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -9,10 +9,7 @@ addif() {
 	# find all vlan configurations for this interface and set them up as well
 	for ifc in $interfaces; do
 		config_get iftype "$ifc" type
-		case "$iftype" in
-			bridge) config_get ifs "$ifc" ifnames;;
-			*) config_get ifs "$ifc" ifname;;
-		esac
+		config_get ifs "$ifc" device
 		for dev in $ifs; do
 			[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
 				add_vlan "$dev"
-- 
cgit v1.2.3