Changeset 257cbc3 in freewrt for package/base-files

Timestamp:

Jul 11, 2006, 8:21:26 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

d629443

Parents:

3a3b320

Message:

use ifup/ifdown, hotplug and ppp scripts and options from known to work whiterussian

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@187 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/base-files/default

Files:

• etc/hotplug.d/net/10-net (deleted)
• sbin/hotplug (modified) (1 diff)
• sbin/ifdown (modified) (1 diff)
• sbin/ifup (modified) (1 diff)

package/base-files/default/sbin/hotplug

@@ -1 +1 @@
 #!/bin/sh
-
-# bypass the normal hotplug path for firmware loading
-# would otherwise cause problems with drivers like bcm43xx
-[ "$1" = "firmware" -a "$ACTION" = "add" ] && {
-        [ -f "/lib/firmware/$FIRMWARE" ] && {
-                echo 1 > "/sys$DEVPATH/loading"
-                cp "/lib/firmware/$FIRMWARE" "/sys$DEVPATH/data"
-                echo 0 > "/sys$DEVPATH/loading"
-        }
-        exit 0
-}
-
 . /etc/functions.sh
-. /etc/config/network
-
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 LOGNAME=root

package/base-files/default/sbin/ifdown

@@ -2 +2 @@
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
-. /etc/config/network
 
+type=$1
 debug "### ifdown $type ###"
-type=$1
 
-eval "if_proto=\"\${${type}_proto}\""
-eval "if=\"\${${type}_ifname}\""
-[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\""
-
-case "$if_proto" in
-        pppoa) hotplug_dev unregister atm0; exit 0 ;;
-        ""|none) exit 0;;
+if=$(nvram get ${type}_ifname)
+proto=$(nvram get ${type}_proto)
+if_valid $if && $DEBUG ifconfig $if down
+[ -r /var/run/${if}.pid ] && kill $(cat /var/run/${if}.pid 2>&-) 2>&-
+killall ifup.$proto >&- 2>&-
+case "$proto" in
+        pptp|pppoe) killall pppd >&- 2>&- ;;
+        static) env -i ACTION="ifdown" INTERFACE="$if" PROTO=static /sbin/hotplug "iface" ;;
 esac
 
-hotplug_dev unregister "$if"

package/base-files/default/sbin/ifup

@@ -1 @@
-#!/bin/sh
+#!/bin/ash
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
-. /etc/config/network
+type=$1
+debug "### ifup $type ###"
 
-ifdown $1
+if_proto=$(nvram get ${type}_proto)
+case "$if_proto" in
+        none|"")exit;;
+esac
+if=$(nvram get ${type}_ifname)
+[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${type}_device)
 
-debug "### ifup $type ###"
-type=$1
-
-eval "if_proto=\"\${${type}_proto}\""
-eval "if=\"\${${type}_ifname}\""
-[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\""
-
-case "$if_proto" in
-        pppoa) hotplug_dev register atm0; exit 0 ;;
-        pppoe)
-                # PPPoE over ATM
-                [ "$if" = "nas0" ] && {
-                        ifconfig nas0 2>&- >&- || {
-                                hotplug_dev register atm0
-                                exit 0
-                        }
-                }
-        ;;
-        none|"") exit 0;;
-esac
+if_valid $if || [ "$if_proto" = "pptp" ] || exit 
+mac=$(nvram get ${type}_hwaddr)
+$DEBUG ifconfig $if down 2>&-
 
 if [ "${if%%[0-9]}" = "br" ]; then
-        eval "ifnames=\"\${${type}_ifnames}\""
-        for sif in $ifnames; do
-                hotplug_dev register "$sif"
+        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
+                $DEBUG ifconfig $sif allmulti
         done
 else
-        hotplug_dev register "$if"
+        ${mac:+$DEBUG ifconfig $if down hw ether $mac}
 fi
+
+do_ifup $if_proto $type