rename alldone to halt

[openwrt.git] / root / etc / functions.sh

diff --git a/root/etc/functions.sh b/root/etc/functions.sh
index 1cf97e3..21efbaf 100755 (executable)
--- a/root/etc/functions.sh
+++ b/root/etc/functions.sh
@@ -1,20 +1,17 @@
-#!/bin/sh
+#!/bin/ash

 
 

-. /etc/nvram.overrides
-
-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)}"
 }

+. /etc/nvram.overrides

 
 # 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


@@ -25,27 +22,26 @@ 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" ] 
-  return $?
+  ifconfig "$1" >/dev/null 2>&1 || [ "${1%%[0-9]}" = "br" ]

 )
 
 wifi () (
   debug "### wifi $1 ###"
   if=$(awk 'gsub(":","") {print $1}' /proc/net/wireless)
 )
 
 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)


@@ -57,26 +53,22 @@ 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)
     } done
   fi
 
   if_mac=$(nvram_get ${type}_hwaddr)

-  [ -z "$if_mac" ] || $DEBUG ifconfig $if hw ether $if_mac
- 
+  ${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 
-      $DEBUG ifconfig $if $if_ip netmask $if_netmask up

 
 

-      ipcalc -s "$if_gateway" || return 
-      $DEBUG route add default gw $if_gateway
+      $DEBUG ifconfig $if $if_ip ${if_netmask:+netmask $if_netmask} up
+      ${if_gateway:+$DEBUG route add default gw $if_gateway}

 
       [ -f /etc/resolv.conf ] && return
 
 
       [ -f /etc/resolv.conf ] && return
 


@@ -90,17 +82,16 @@ ifup () (
       if [ -f $pidfile ]; then
         $DEBUG kill $(cat $pidfile)
       fi
       if [ -f $pidfile ]; then
         $DEBUG kill $(cat $pidfile)
       fi

-      cmd="udhcpc -i $if -b -p $pidfile &"
-      ${DEBUG:-eval} $cmd
+      ${DEBUG:-eval} "udhcpc -i $if -b -p $pidfile &" 

     ;;
     pppoe)
       if_username=$(nvram_get ppp_username)
       if_password=$(nvram_get ppp_passwd)
       if_redial=$(nvram_get ppp_redialperiod)
       if_idletime=$(nvram_get ppp_idletime)
     ;;
     pppoe)
       if_username=$(nvram_get ppp_username)
       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
     ;;
     *)


@@ -109,10 +100,9 @@ ifup () (
   esac
 )
 
   esac
 )
 

-ifdown () (                                                                       
+ifdown () (

   type=$1
   debug "### ifdown $type ###"
   type=$1
   debug "### ifdown $type ###"

-  if=$(nvram_get ${type}_ifname)                                                
-  if_valid $if || return                                                        
-  $DEBUG ifdown $if
+  if=$(nvram_get ${type}_ifname)
+  if_valid $if && $DEBUG ifconfig $if down

 )
 )