projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f687039
)
cleanup, remove whitespace at end of lines
author
Mike Baker
<mbm@openwrt.org>
Sun, 6 Jun 2004 04:52:51 +0000
(
04:52
+0000)
committer
Mike Baker
<mbm@openwrt.org>
Sun, 6 Jun 2004 04:52:51 +0000
(
04:52
+0000)
SVN-Revision: 61
root/etc/functions.sh
patch
|
blob
|
history
diff --git
a/root/etc/functions.sh
b/root/etc/functions.sh
index 4e96ad77ca21d3bc315aee7fc4e7f3bed00907fe..f8af756516c9f4b09fcede82c0c4fb42e02c0322 100755
(executable)
--- a/
root/etc/functions.sh
+++ b/
root/etc/functions.sh
@@
-1,10
+1,8
@@
-#!/bin/sh
+#!/bin/
a
sh
-debug () {
- [ -z "$DEBUG" ] || echo $1
-}
+alias debug=${DEBUG:-true}
-# allow env to override nvram
+# allow env to override nvram
nvram_get () {
eval "echo \${$1:-\$(nvram get $1)}"
}
nvram_get () {
eval "echo \${$1:-\$(nvram get $1)}"
}
@@
-13,7
+11,7
@@
nvram_get () {
# valid interface?
if_valid () (
[ "${1%%[0-9]}" = "vlan" ] && {
# valid interface?
if_valid () (
[ "${1%%[0-9]}" = "vlan" ] && {
- i=${1#vlan}
+ i=${1#vlan}
hwname=$(nvram_get vlan${i}hwname)
hwaddr=$(nvram_get ${hwname}macaddr)
[ -z "$hwaddr" ] && return 1
hwname=$(nvram_get vlan${i}hwname)
hwaddr=$(nvram_get ${hwname}macaddr)
[ -z "$hwaddr" ] && return 1
@@
-24,27
+22,27
@@
if_valid () (
$DEBUG ifconfig $vif up
$DEBUG vconfig add $vif $i 2>/dev/null
}
$DEBUG ifconfig $vif up
$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 $?
)
wifi () (
debug "### wifi $1 ###"
if=$(awk 'gsub(":","") {print $1}' /proc/net/wireless)
return $?
)
wifi () (
debug "### wifi $1 ###"
if=$(awk 'gsub(":","") {print $1}' /proc/net/wireless)
- $DEBUG wlconf $if $1
+ $DEBUG wlconf $if $1
)
ifup () (
type=$1
debug "### ifup $type ###"
)
ifup () (
type=$1
debug "### ifup $type ###"
-
+
if=$(nvram_get ${type}_ifname)
if [ "${if%%[0-9]}" = "ppp" ]; then
if=$(nvram_get ${type}_ifname)
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
if [ "${if%%[0-9]}" = "br" ]; then
stp=$(nvram_get ${type}_stp)
$DEBUG ifconfig $if down
if [ "${if%%[0-9]}" = "br" ]; then
stp=$(nvram_get ${type}_stp)
@@
-56,25
+54,25
@@
ifup () (
for sif in $if_list; do {
if_valid $sif || continue
$DEBUG ifconfig $sif 0.0.0.0 up
for sif in $if_list; do {
if_valid $sif || continue
$DEBUG ifconfig $sif 0.0.0.0 up
- $DEBUG brctl addif $if $sif
+ $DEBUG brctl addif $if $sif
} done
fi
if_mac=$(nvram_get ${type}_hwaddr)
[ -z "$if_mac" ] || $DEBUG ifconfig $if hw ether $if_mac
} done
fi
if_mac=$(nvram_get ${type}_hwaddr)
[ -z "$if_mac" ] || $DEBUG ifconfig $if hw ether $if_mac
-
+
if_proto=$(nvram_get ${type}_proto)
case "$if_proto" in
static)
if_ip=$(nvram_get ${type}_ipaddr)
if_netmask=$(nvram_get ${type}_netmask)
if_gateway=$(nvram_get ${type}_gateway)
if_proto=$(nvram_get ${type}_proto)
case "$if_proto" in
static)
if_ip=$(nvram_get ${type}_ipaddr)
if_netmask=$(nvram_get ${type}_netmask)
if_gateway=$(nvram_get ${type}_gateway)
-
- ipcalc -s "$if_ip" || return
- ipcalc -s "$if_netmask" || return
+
+ ipcalc -s "$if_ip" || 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
[ -f /etc/resolv.conf ] && return
$DEBUG route add default gw $if_gateway
[ -f /etc/resolv.conf ] && return
@@
-97,9
+95,9
@@
ifup () (
if_password=$(nvram_get ppp_passwd)
if_redial=$(nvram_get ppp_redialperiod)
if_idletime=$(nvram_get ppp_idletime)
if_password=$(nvram_get ppp_passwd)
if_redial=$(nvram_get ppp_redialperiod)
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
debug "### ifdown $type ###"
type=$1
debug "### ifdown $type ###"
- if=$(nvram_get ${type}_ifname)
- if_valid $if || return
+ if=$(nvram_get ${type}_ifname)
+ if_valid $if || return
$DEBUG ifdown $if
)
$DEBUG ifdown $if
)