diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-21 14:02:53 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-21 14:02:53 +0000 |
commit | f80d4fdc68858ba956a39e19ad6efa868beb827e (patch) | |
tree | 6774b82fd38b45494fc668c919d763dae64ab7c1 /package/base-files/default/etc/init.d | |
parent | a73e9e4b00485d9182471cae6e3911878a4486b8 (diff) |
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
Diffstat (limited to 'package/base-files/default/etc/init.d')
-rwxr-xr-x | package/base-files/default/etc/init.d/S10boot | 30 | ||||
-rwxr-xr-x | package/base-files/default/etc/init.d/S40network | 1 | ||||
-rwxr-xr-x | package/base-files/default/etc/init.d/S45firewall | 2 | ||||
-rwxr-xr-x | package/base-files/default/etc/init.d/S50dnsmasq | 2 |
4 files changed, 21 insertions, 14 deletions
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot index ead73521b..d45f8e809 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 d8b4e4125..a5afe5266 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 cb779792d..188b9aaa8 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 6a5af0f05..31d0a3697 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 |