From 7619fe0848dc5f31d5c4c4cadd2ec067bd5c55d1 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 17 Jul 2005 22:52:59 +0000 Subject: move target/default/target_skeleton into package/base-files, put all the default files in ipkg packages, cleanup some junk in toolchain/, toolchain/ no longer changes build_mipsel/root git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1494 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 package/base-files/default/sbin/ifdown (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown new file mode 100755 index 000000000..6b255cc1b --- /dev/null +++ b/package/base-files/default/sbin/ifdown @@ -0,0 +1,9 @@ +#!/bin/ash +[ $# = 0 ] && { echo " $0 "; exit; } +. /etc/functions.sh +type=$1 +debug "### ifdown $type ###" +if=$(nvram get ${type}_ifname) +if_valid $if || exit +$DEBUG ifconfig $if down +kill $(cat /var/run/${if}.pid 2>&-) 2>&- -- cgit v1.2.3 From f80d4fdc68858ba956a39e19ad6efa868beb827e Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Jul 2005 14:02:53 +0000 Subject: add config file /etc/config/network, add board-specific network.overrides (instead of nvram.overrides) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1519 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 6b255cc1b..950ee12db 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -1,6 +1,8 @@ #!/bin/ash [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh +. /etc/network.overrides +[ -e /etc/config/network ] && . /etc/config/network type=$1 debug "### ifdown $type ###" if=$(nvram get ${type}_ifname) -- cgit v1.2.3 From 84e5ae23cefdd6c8c713483fe13fdcdba045de4e Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 25 Aug 2005 11:57:56 +0000 Subject: don't load config files in failsafe mode git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1750 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 950ee12db..2d4054d8b 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -2,7 +2,7 @@ [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh . /etc/network.overrides -[ -e /etc/config/network ] && . /etc/config/network +[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network type=$1 debug "### ifdown $type ###" if=$(nvram get ${type}_ifname) -- cgit v1.2.3 From 15713b2da9a57d19a4b04af0dd77362c92979966 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Oct 2005 20:47:19 +0000 Subject: sync base-files with whiterussian git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2260 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 2d4054d8b..147136949 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -6,6 +6,8 @@ type=$1 debug "### ifdown $type ###" if=$(nvram get ${type}_ifname) -if_valid $if || exit -$DEBUG ifconfig $if down +proto=$(nvram get ${type}_proto) +if_valid $if && $DEBUG ifconfig $if down kill $(cat /var/run/${if}.pid 2>&-) 2>&- +[ "$if" = "ppp0" ] && killall pppd +killall ifup.$proto >&- 2>&- -- cgit v1.2.3 From 0bb68e81eca839c8eed0c629b403ac558ea662e6 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 7 Nov 2005 01:12:51 +0000 Subject: add hotplug stuff to trunk/ git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2364 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 147136949..f2f8bbfe8 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -1,13 +1,19 @@ -#!/bin/ash +#!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -. /etc/network.overrides +. /etc/network.overrides [ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network + type=$1 debug "### ifdown $type ###" + if=$(nvram get ${type}_ifname) proto=$(nvram get ${type}_proto) if_valid $if && $DEBUG ifconfig $if down kill $(cat /var/run/${if}.pid 2>&-) 2>&- -[ "$if" = "ppp0" ] && killall pppd 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 + -- cgit v1.2.3 From 2af90479fbd25ca63d9697200d43ea614d657184 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Nov 2005 03:17:20 +0000 Subject: hotplug-based network script rewrite git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2531 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index f2f8bbfe8..3ebc251f7 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -1,19 +1,29 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -. /etc/network.overrides +. /etc/network.overrides [ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network -type=$1 debug "### ifdown $type ###" +type=$1 +if_proto=$(nvram get ${type}_proto) if=$(nvram get ${type}_ifname) -proto=$(nvram get ${type}_proto) -if_valid $if && $DEBUG ifconfig $if down -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" ;; + +case "$if_proto" in + pppoa) hotplug_dev unregister atm0; exit 0 ;; + pppoe) + [ "$(nvram get pppoe_atm)" = 1 ] && { + hotplug_dev unregister atm0 + exit + } + ;; esac +if [ "${if%%[0-9]}" = "br" ]; then + for sif in $(nvram get ${type}_ifnames); do + hotplug_dev unregister "$sif" + done +fi + +hotplug_dev unregister "$if" -- cgit v1.2.3 From 76dec73b0b803f861192efe08b95f2cf331a96e2 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Nov 2005 14:53:21 +0000 Subject: fix ifup/down for ppp-based stuff git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2536 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 3ebc251f7..8818d4614 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -12,12 +12,7 @@ if=$(nvram get ${type}_ifname) case "$if_proto" in pppoa) hotplug_dev unregister atm0; exit 0 ;; - pppoe) - [ "$(nvram get pppoe_atm)" = 1 ] && { - hotplug_dev unregister atm0 - exit - } - ;; + ""|none) exit 0;; esac if [ "${if%%[0-9]}" = "br" ]; then -- cgit v1.2.3 From 777e76abb47dd74816ea063c471359b0db3aa2e7 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Nov 2005 19:04:15 +0000 Subject: more fixes for the network scripts git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2537 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 8818d4614..85bb2fbc5 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -15,6 +15,8 @@ case "$if_proto" in ""|none) exit 0;; esac +[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)" + if [ "${if%%[0-9]}" = "br" ]; then for sif in $(nvram get ${type}_ifnames); do hotplug_dev unregister "$sif" -- cgit v1.2.3 From 23e86550c9c59436cc5f253292774861dd6ca62e Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 16 Jan 2006 03:14:59 +0000 Subject: port wan_device changes from whiterussian to kamikaze git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2993 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 85bb2fbc5..d0120dcbe 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -15,7 +15,7 @@ case "$if_proto" in ""|none) exit 0;; esac -[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)" +[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)" if [ "${if%%[0-9]}" = "br" ]; then for sif in $(nvram get ${type}_ifnames); do -- cgit v1.2.3 From 676c017ecfced2e37aeec176f8aa6b9df90024f3 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 5 Apr 2006 02:09:22 +0000 Subject: large init script cleanup and merge of whiterussian changes, new dnsmasq config handling git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3588 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index d0120dcbe..0d85ca8ea 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -1,26 +1,18 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -. /etc/network.overrides -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network +. /etc/config/network debug "### ifdown $type ###" type=$1 -if_proto=$(nvram get ${type}_proto) -if=$(nvram get ${type}_ifname) +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;; esac -[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)" - -if [ "${if%%[0-9]}" = "br" ]; then - for sif in $(nvram get ${type}_ifnames); do - hotplug_dev unregister "$sif" - done -fi - hotplug_dev unregister "$if" -- cgit v1.2.3 From ed5ef674d100ca0ffa8bc00160718f69af5515c3 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 27 Jun 2006 00:36:13 +0000 Subject: add copyright headers to base-files scripts and config files git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4090 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 0d85ca8ea..50ffee530 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh . /etc/config/network -- cgit v1.2.3 From c4f3575368c5aeef4134d82125df2814d688cc2a Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 30 Jul 2006 03:09:09 +0000 Subject: rewrite of the network scripts and configuration git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4323 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 50ffee530..7debb9559 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -3,18 +3,32 @@ [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -. /etc/config/network +include network +scan_interfaces debug "### ifdown $type ###" type=$1 -eval "if_proto=\"\${${type}_proto}\"" -eval "if=\"\${${type}_ifname}\"" -[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\"" +config_get proto "$type" proto +[ -z "$proto" ] && { echo "interface not found."; exit; } -case "$if_proto" in - pppoa) hotplug_dev unregister atm0; exit 0 ;; - ""|none) exit 0;; -esac +# kill active ppp daemon +pid="$(cat /var/run/ppp-${type}.pid 2>/dev/null)" +[ -n "$pid" -a -d "/proc/$pid" ] && { + kill $pid + sleep 1 + [ -d "/proc/$pid" ] && kill -9 $pid +} -hotplug_dev unregister "$if" +# kill any other process associated with the interface +config_get ifname "$type" ifname +pid="$(cat /var/run/${ifname}.pid 2>/dev/null)" +[ -n "$pid" -a -d "/proc/$pid" ] && kill -9 $pid + +config_get ifname "$type" ifname +ifconfig "$ifname" >/dev/null 2>/dev/null && { + ifconfig "$ifname" 0.0.0.0 down + + config_get iftype "$type" type + [ "$iftype" = "bridge" ] && brctl delbr "$ifname" +} -- cgit v1.2.3 From fd40fb97f848901b4d3c197d0e83e95b01312f9a Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 30 Jul 2006 13:21:18 +0000 Subject: fix more instances of '' abuse git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4326 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 7debb9559..1334ee821 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -6,14 +6,14 @@ include network scan_interfaces -debug "### ifdown $type ###" -type=$1 +cfg=$1 +debug "### ifdown $cfg ###" -config_get proto "$type" proto +config_get proto "$cfg" proto [ -z "$proto" ] && { echo "interface not found."; exit; } # kill active ppp daemon -pid="$(cat /var/run/ppp-${type}.pid 2>/dev/null)" +pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)" [ -n "$pid" -a -d "/proc/$pid" ] && { kill $pid sleep 1 @@ -21,14 +21,14 @@ pid="$(cat /var/run/ppp-${type}.pid 2>/dev/null)" } # kill any other process associated with the interface -config_get ifname "$type" ifname +config_get ifname "$cfg" ifname pid="$(cat /var/run/${ifname}.pid 2>/dev/null)" [ -n "$pid" -a -d "/proc/$pid" ] && kill -9 $pid -config_get ifname "$type" ifname +config_get ifname "$cfg" ifname ifconfig "$ifname" >/dev/null 2>/dev/null && { ifconfig "$ifname" 0.0.0.0 down - config_get iftype "$type" type + config_get iftype "$cfg" type [ "$iftype" = "bridge" ] && brctl delbr "$ifname" } -- cgit v1.2.3 From 139dfb16c8d408dce549701a7b3e57f5f06d5257 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 24 Sep 2006 13:32:18 +0000 Subject: use absolute paths in include() shell function git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4852 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/sbin/ifdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/default/sbin/ifdown') diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 1334ee821..073e80d2d 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -3,7 +3,7 @@ [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -include network +include /lib/network scan_interfaces cfg=$1 -- cgit v1.2.3