ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-11 13:15:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cleanup, remove whitespace at end of lines

Browse Source 
SVN-Revision: 61
This commit is contained in:
Mike Baker 2004-06-06 04:52:51 +00:00
parent 803c2fc439
commit e685d5f8a3
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
root/etc/functions.sh
View File

@ -1,10 +1,8 @@
#!/bin/sh #!/bin/ash
debug () { alias debug=${DEBUG:-true}
[ -z "$DEBUG" ] || echo $1
}
# allow env to override nvram # allow env to override nvram
nvram_get () { nvram_get () {
eval "echo \${$1:-\$(nvram get $1)}" eval "echo \${$1:-\$(nvram get $1)}"
} }
@ -13,7 +11,7 @@ nvram_get () {
# valid interface? # valid interface?
if_valid () ( if_valid () (
[ "${1%%[0-9]}" = "vlan" ] && { [ "${1%%[0-9]}" = "vlan" ] && {
i=${1#vlan} i=${1#vlan}
hwname=$(nvram_get vlan${i}hwname) hwname=$(nvram_get vlan${i}hwname)
hwaddr=$(nvram_get ${hwname}macaddr) hwaddr=$(nvram_get ${hwname}macaddr)
[ -z "$hwaddr" ] && return 1 [ -z "$hwaddr" ] && return 1
@ -24,27 +22,27 @@ if_valid () (
$DEBUG ifconfig $vif up $DEBUG ifconfig $vif up
$DEBUG vconfig add $vif $i 2>/dev/null $DEBUG vconfig add $vif $i 2>/dev/null
} }
ifconfig "$1" >/dev/null 2>&1 || [ "${1%%[0-9]}" = "br" ] ifconfig "$1" >/dev/null 2>&1 || [ "${1%%[0-9]}" = "br" ]
return $? return $?
) )
wifi () ( wifi () (
debug "### wifi $1 ###" debug "### wifi $1 ###"
if=$(awk 'gsub(":","") {print $1}' /proc/net/wireless) if=$(awk 'gsub(":","") {print $1}' /proc/net/wireless)
$DEBUG wlconf $if $1 $DEBUG wlconf $if $1
) )
ifup () ( ifup () (
type=$1 type=$1
debug "### ifup $type ###" debug "### ifup $type ###"
if=$(nvram_get ${type}_ifname) if=$(nvram_get ${type}_ifname)
if [ "${if%%[0-9]}" = "ppp" ]; then if [ "${if%%[0-9]}" = "ppp" ]; then
if=$(nvram_get pppoe_ifname) if=$(nvram_get pppoe_ifname)
fi fi
if_valid $if || return if_valid $if || return
$DEBUG ifconfig $if down $DEBUG ifconfig $if down
if [ "${if%%[0-9]}" = "br" ]; then if [ "${if%%[0-9]}" = "br" ]; then
stp=$(nvram_get ${type}_stp) stp=$(nvram_get ${type}_stp)
@ -56,25 +54,25 @@ ifup () (
for sif in $if_list; do { for sif in $if_list; do {
if_valid $sif || continue if_valid $sif || continue
$DEBUG ifconfig $sif 0.0.0.0 up $DEBUG ifconfig $sif 0.0.0.0 up
$DEBUG brctl addif $if $sif $DEBUG brctl addif $if $sif
} done } done
fi fi
if_mac=$(nvram_get ${type}_hwaddr) if_mac=$(nvram_get ${type}_hwaddr)
[ -z "$if_mac" ] || $DEBUG ifconfig $if hw ether $if_mac [ -z "$if_mac" ] || $DEBUG ifconfig $if hw ether $if_mac
if_proto=$(nvram_get ${type}_proto) if_proto=$(nvram_get ${type}_proto)
case "$if_proto" in case "$if_proto" in
static) static)
if_ip=$(nvram_get ${type}_ipaddr) if_ip=$(nvram_get ${type}_ipaddr)
if_netmask=$(nvram_get ${type}_netmask) if_netmask=$(nvram_get ${type}_netmask)
if_gateway=$(nvram_get ${type}_gateway) if_gateway=$(nvram_get ${type}_gateway)
ipcalc -s "$if_ip" || return ipcalc -s "$if_ip" || return
ipcalc -s "$if_netmask" || return ipcalc -s "$if_netmask" || return
$DEBUG ifconfig $if $if_ip netmask $if_netmask up $DEBUG ifconfig $if $if_ip netmask $if_netmask up
ipcalc -s "$if_gateway" || return ipcalc -s "$if_gateway" || return
$DEBUG route add default gw $if_gateway $DEBUG route add default gw $if_gateway
[ -f /etc/resolv.conf ] && return [ -f /etc/resolv.conf ] && return
@ -97,9 +95,9 @@ ifup () (
if_password=$(nvram_get ppp_passwd) if_password=$(nvram_get ppp_passwd)
if_redial=$(nvram_get ppp_redialperiod) if_redial=$(nvram_get ppp_redialperiod)
if_idletime=$(nvram_get ppp_idletime) if_idletime=$(nvram_get ppp_idletime)
$DEBUG ifconfig $if 0.0.0.0 up $DEBUG ifconfig $if 0.0.0.0 up
$DEBUG /sbin/pppoecd $if -u $if_username -p $if_password -i 0 -I $if_redial -T $if_idletime -k $DEBUG /sbin/pppoecd $if -u $if_username -p $if_password -i 0 -I $if_redial -T $if_idletime -k
;; ;;
*) *)
@ -108,10 +106,10 @@ ifup () (
esac esac
) )
ifdown () ( ifdown () (
type=$1 type=$1
debug "### ifdown $type ###" debug "### ifdown $type ###"
if=$(nvram_get ${type}_ifname) if=$(nvram_get ${type}_ifname)
if_valid $if || return if_valid $if || return
$DEBUG ifdown $if $DEBUG ifdown $if
) )