mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

more fixes for the network scripts

Browse Source 
SVN-Revision: 2537
This commit is contained in:
Felix Fietkau 2005-11-19 19:04:15 +00:00
parent 969a4d1c2a
commit 81668c7ab9
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openwrt/package/base-files/default/etc/hotplug.d/net/10-net
View File

@ -23,22 +23,21 @@ find_name()
IFTYPE="${ifname}" IFTYPE="${ifname}"
IFPROTO="$(nvram get ${IFTYPE}_proto)" IFPROTO="$(nvram get ${IFTYPE}_proto)"
IFACE="$(nvram get ${IFTYPE}_ifname)" IFACE="$(nvram get ${IFTYPE}_ifname)"
[ -z "$IFPROTO" -o "$IFPROTO" = "none" ] || { case "$IFPROTO" in
[ "${IFACE}" = "$INTERFACE" ] && return 0 ""|none);;
case "$IFPROTO" in static|dhcp)
static|dhcp) [ "${IFACE}" = "$INTERFACE" ] && return 0
[ "${IFACE%%[0-9]*}" = "br" ] && { [ "${IFACE%%[0-9]*}" = "br" ] && {
for part in $(nvram get ${IFTYPE}_ifnames); do for part in $(nvram get ${IFTYPE}_ifnames); do
[ "$part" = "$INTERFACE" ] && return 0 [ "$part" = "$INTERFACE" ] && return 0
done done
} }
;; ;;
*) *)
[ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \ [ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
-a -x /sbin/ifup.${IFPROTO} ] && return 0 -a -x /sbin/ifup.${IFPROTO} ] && return 0
;; ;;
esac esac
}
done done
IFACE="" IFACE=""
IFTYPE="" IFTYPE=""
@ -155,13 +154,12 @@ do_register()
do_ifup "$IFPROTO" "$IFTYPE" "$if" do_ifup "$IFPROTO" "$IFTYPE" "$if"
fi fi
} }
else else
do_ifup "$IFPROTO" "$IFTYPE" "$if" [ "${INTERFACE%%[0-9]*}" = "ppp" ] || do_ifup "$IFPROTO" "$IFTYPE" "$if"
fi fi
} }
do_unregister() { do_unregister() {
[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
[ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name [ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name
[ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0 [ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0
@ -175,13 +173,14 @@ do_unregister() {
case "$IFPROTO" in case "$IFPROTO" in
pppoe|pppoa|pptp) pppoe|pppoa|pptp)
killall ifup.${IFPROTO} 2>&- >&-
killall pppd 2>&- >&- killall pppd 2>&- >&-
;; ;;
dhcp) dhcp)
[ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&- [ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&-
;; ;;
esac esac
[ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
} }
case "$ACTION" in case "$ACTION" in

2
openwrt/package/base-files/default/sbin/ifdown
View File

@ -15,6 +15,8 @@ case "$if_proto" in
""|none) exit 0;; ""|none) exit 0;;
esac esac
[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)"
if [ "${if%%[0-9]}" = "br" ]; then if [ "${if%%[0-9]}" = "br" ]; then
for sif in $(nvram get ${type}_ifnames); do for sif in $(nvram get ${type}_ifnames); do
hotplug_dev unregister "$sif" hotplug_dev unregister "$sif"

2
openwrt/package/base-files/default/sbin/ifup
View File

@ -23,6 +23,8 @@ case "$if_proto" in
none|"") exit 0;; none|"") exit 0;;
esac esac
[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)"
if [ "${if%%[0-9]}" = "br" ]; then if [ "${if%%[0-9]}" = "br" ]; then
for sif in $(nvram get ${type}_ifnames); do for sif in $(nvram get ${type}_ifnames); do
hotplug_dev register "$sif" hotplug_dev register "$sif"