berkeley db4, for openldap server

[openwrt.git] / target / default / target_skeleton / sbin / ifup

diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup
index f8e41ce..3748d76 100755 (executable)
--- a/target/default/target_skeleton/sbin/ifup
+++ b/target/default/target_skeleton/sbin/ifup
@@ -1,72 +1,63 @@
 #!/bin/ash
 . /etc/functions.sh
-  type=$1
-  debug "### ifup $type ###"
-
-  if=$(nvram get ${type}_ifname)
-  if [ "${if%%[0-9]}" = "ppp" ]; then
-    if=$(nvram get pppoe_ifname)
-  fi
-
-  if_valid $if || return
-
-  $DEBUG ifconfig $if down
-  if [ "${if%%[0-9]}" = "br" ]; then
-    stp=$(nvram get ${type}_stp)
-    $DEBUG brctl delbr $if
-    $DEBUG brctl addbr $if
-    $DEBUG brctl setfd $if 0
-    $DEBUG brctl stp $if ${stp:-0}
-    for sif in $(nvram get ${type}_ifnames); do {
-      if_valid $sif || continue
-      $DEBUG ifconfig $sif 0.0.0.0 up
-      $DEBUG brctl addif $if $sif
-    } done
-  fi
-
-  mac=$(nvram get ${type}_hwaddr)
-  ${mac:+$DEBUG ifconfig $if hw ether $mac}
-
-  if_proto=$(nvram get ${type}_proto)
-  case "$if_proto" in
-    static)
-      ip=$(nvram get ${type}_ipaddr)
-      netmask=$(nvram get ${type}_netmask)
-      gateway=$(nvram get ${type}_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 ${type}_dns); do {
+type=$1
+debug "### ifup $type ###"
+
+if=$(nvram get ${type}_ifname)
+if [ "${if%%[0-9]}" = "ppp" ]; then
+  if=$(nvram get pppoe_ifname)
+fi
+
+if_valid $if || return
+
+mac=$(nvram get ${type}_hwaddr)
+$DEBUG ifconfig $if down 2>&-
+if [ "${if%%[0-9]}" = "br" ]; then
+  stp=$(nvram get ${type}_stp)
+  $DEBUG brctl delbr $if 2>&-
+  $DEBUG brctl addbr $if
+  $DEBUG brctl setfd $if 0
+  $DEBUG brctl stp $if ${stp:-0}
+  for sif in $(nvram get ${type}_ifnames); do {
+    if_valid $sif || continue
+    ${mac:+$DEBUG ifconfig $sif down hw ether $mac}
+    $DEBUG ifconfig $sif 0.0.0.0 up
+    $DEBUG brctl addif $if $sif
+  } done
+else
+  ${mac:+$DEBUG ifconfig $if down hw ether $mac}
+fi
+
+
+if_proto=$(nvram get ${type}_proto)
+case "$if_proto" in
+  static)
+    ip=$(nvram get ${type}_ipaddr)
+    netmask=$(nvram get ${type}_netmask)
+    gateway=$(nvram get ${type}_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 ${type}_dns); do {
        echo "nameserver $dns" >> /etc/resolv.conf
-      } done
-    ;;
-    dhcp)
-      pidfile=/tmp/dhcp-${type}.pid
-      if [ -f $pidfile ]; then
-        $DEBUG kill $(cat $pidfile)
-      fi
-      ${DEBUG:-eval} "udhcpc -i $if -b -p $pidfile &" 
-    ;;
-    pppoe)
-      username=$(nvram get ppp_username)
-      password=$(nvram get ppp_passwd)
-      redial=$(nvram get ppp_redialperiod)
-      idletime=$(nvram get ppp_idletime)
-      mtu=$(nvram get wan_mtu)
-
-#      handled by /etc/init.d/S50pppoe
-#      $DEBUG ifconfig $if 0.0.0.0 up
-
-#      $DEBUG /sbin/pppoecd $if -u $username -p $password \
-#        -i 0 -I $redial -T $idletime -t $mtu -k
-    ;;
-    none)
-    ;;
-    *)
-      echo "### WARNING $if: $if_proto is not supported"
-    ;;
-  esac
+    } done
+  ;;
+  dhcp)
+    ip=$(nvram get ${type}_ipaddr)
+    pidfile=/tmp/dhcp-${type}.pid
+    if [ -f $pidfile ]; then
+      $DEBUG kill $(cat $pidfile)
+    fi
+    ${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &" 
+  ;;
+  none|"")
+  ;;
+  *)
+    [ -x "/sbin/ifup.${if_proto}" ] && { $DEBUG /sbin/ifup.${if_proto} $*; exit; }
+    echo "### ifup $type: ignored ${type}_proto=\"$if_proto\" (not supported)"
+  ;;
+esac