Hi,
spaetzle, please do me a favour, just send your patches first to the
mailinglist. If no one response after 2 days, please commit.
We have an important project running with trunk, and your rework and
finetuning in fwifupdown, should always be tested and verified to
work in any case, before a commit.
Thanks in advance
Waldemar
On Tue, 03 Jul 2007 at 15:31 +0200, [EMAIL PROTECTED] wrote:
> Author: tg
> Date: 2007-07-03 15:31:26 +0200 (Tue, 03 Jul 2007)
> New Revision: 3105
>
> Modified:
> trunk/freewrt/package/fwifupdown/Makefile
> trunk/freewrt/package/fwifupdown/files/ifupdown.sh
> trunk/freewrt/package/fwifupdown/lib/bridge
> Log:
> revert r3103 – the code is not bridge only (in theory, but no other
> interface uses it YET) and I put it in there not without thought
>
>
> Modified: trunk/freewrt/package/fwifupdown/Makefile
> ===================================================================
> --- trunk/freewrt/package/fwifupdown/Makefile 2007-07-03 11:33:58 UTC (rev
> 3104)
> +++ trunk/freewrt/package/fwifupdown/Makefile 2007-07-03 13:31:26 UTC (rev
> 3105)
> @@ -8,7 +8,7 @@
>
> PKG_NAME:= fwifupdown
> PKG_VERSION:= 0.2
> -PKG_RELEASE:= 32
> +PKG_RELEASE:= 33
> PKG_SRC_ROOT:= ${TOPDIR}/package/${PKG_NAME}
> PKG_CONFIG_WORKDIR:= etc/network
> PKG_CONFIG_INITDIR:= etc/init.d
>
> Modified: trunk/freewrt/package/fwifupdown/files/ifupdown.sh
> ===================================================================
> --- trunk/freewrt/package/fwifupdown/files/ifupdown.sh 2007-07-03
> 11:33:58 UTC (rev 3104)
> +++ trunk/freewrt/package/fwifupdown/files/ifupdown.sh 2007-07-03
> 13:31:26 UTC (rev 3105)
> @@ -42,7 +42,40 @@
> eval IFUPDOWN_ENV= $(grep '^FWIFUPDOWN_' /etc/rc.conf |sed "s/#.*//g") \
> busybox $what $@ $redirect
>
> -. /etc/network/iftypes/bridge 2>&- || exit 0
> -bridge_watchdog $redirect
> +i=0 # did we print the initialisation message?
> +j=0 # timeout in seconds
> +rv=0 # exit status of this script
> +while sleep 1; do
> + if test $j -gt 30; then
> + mstate 1
> + merr "bridge initialisation timed out"
> + rv=1
> + break
> + fi
> + for x in /tmp/ifupdown/ifstate/bridge/*; do
> + # any bridges to check?
> + test -e "$x" || break 2 # no -> out of both loops
> + # print initialisation message, but once only
> + test $i = 1 || mprint -n \
> + "Waiting for bridge initialisation to finish"
> + i=1
> + # check this bridge for its states
> + s=ok
> + for state in $(brctl showstp ${x##*/} | \
> + fgrep state | sed "s/^.*state//"); do
> + test x"$state" = x"forwarding" && continue
> + # if only one is not forwarding, wait
> + s=no
> + break
> + done
> + test $s = ok || break # not ok? wait one second
> + rm -f $x # this bridge done, check next ones
> + done
> + j=$(expr $j + 1)
> +done
> +test $i = 0 || {
> + mstate $rv
> + minfo "took $j seconds"
> +}
>
> # vim:ts=4
>
> Modified: trunk/freewrt/package/fwifupdown/lib/bridge
> ===================================================================
> --- trunk/freewrt/package/fwifupdown/lib/bridge 2007-07-03 11:33:58 UTC
> (rev 3104)
> +++ trunk/freewrt/package/fwifupdown/lib/bridge 2007-07-03 13:31:26 UTC
> (rev 3105)
> @@ -97,43 +97,6 @@
> mstate 0
> }
>
> -bridge_watchdog() {
> - i=0 # did we print the initialisation message?
> - j=0 # timeout in seconds
> - rv=0 # exit status of this script
> - while sleep 1; do
> - if test $j -gt 30; then
> - mstate 1
> - merr "bridge initialisation timed out"
> - rv=1
> - break
> - fi
> - for x in /tmp/ifupdown/ifstate/bridge/*; do
> - # any bridges to check?
> - test -e "$x" || break 2 # no -> out of both
> loops
> - # print initialisation message, but once only
> - test $i = 1 || mprint -n \
> - "Waiting for bridge initialisation to finish"
> - i=1
> - # check this bridge for its states
> - s=ok
> - for state in $(brctl showstp ${x##*/} | \
> - fgrep state | sed "s/^.*state//"); do
> - test x"$state" = x"forwarding" && continue
> - # if only one is not forwarding, wait
> - s=no
> - break
> - done
> - test $s = ok || break # not ok? wait one second
> - rm -f $x # this bridge done, check next
> ones
> - done
> - j=$(expr $j + 1)
> - done
> - test $i = 0 && return
> - mstate $rv
> - minfo "took $j seconds"
> -}
> -
> if_preup() {
> if ! [ -x "$(which brctl)" ]
> then
>
> _______________________________________________
> freewrt-commits mailing list
> [EMAIL PROTECTED]
> https://www.freewrt.org/lists/listinfo/freewrt-commits
--
All embedded development kits suck. This one just sucks less.
http://www.freewrt.org
_______________________________________________
freewrt-developers mailing list
[email protected]
https://www.freewrt.org/lists/listinfo/freewrt-developers
