X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4e6508d7fe06af26aedce12a660c9ba76bff361b..92efe0ea18e0752bf8f78e9257094e3fe76ec5a4:/openwrt/target/default/target_skeleton/sbin/ifup

diff --git a/openwrt/target/default/target_skeleton/sbin/ifup b/openwrt/target/default/target_skeleton/sbin/ifup
index 72efa6901..3d81364d0 100755
--- a/openwrt/target/default/target_skeleton/sbin/ifup
+++ b/openwrt/target/default/target_skeleton/sbin/ifup
@@ -1,62 +1,59 @@
 #!/bin/ash
+[ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /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 {
-	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)
-	# handled by /etc/init.d/S50pppoe
-    ;;
-    none)
-    ;;
-    *)
-      echo "### WARNING $if: $if_proto is not supported"
-    ;;
-  esac
+type=$1
+debug "### ifup $type ###"
+
+if_proto=$(nvram get ${type}_proto)
+if=$(nvram get ${type}_ifname)
+[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)
+
+if_valid $if || exit 
+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
+
+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)
+		ip=$(nvram get ${type}_ipaddr)
+		[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
+		${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