Changeset aa2bc52f in freewrt for package/fwifupdown/files

Timestamp:

Jul 1, 2007, 6:28:53 PM (18 years ago)

Author:

Christian Fischer <spaetzle@…>

Children:

de6433b

Parents:

ff38870

Message:

• updated wl-broadcom script to work with latest wl this is untested but the old one doesn't work and i have no time to test next days

• removed output noise from ifup, used mprint instead of echo

• updated manual stuff, from now manual doesn't configure iface but sets it up or down

• removed bridge shutdown if bridge init fails not to 100 percent complete initialized bridge is better than having no network, the normal user doesn't have serial access

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

Location:

package/fwifupdown/files

Files:

• ifupdown.sh (modified) (3 diffs)
• main.sh (modified) (2 diffs)

package/fwifupdown/files/ifupdown.sh

@@ -47 +47 @@
 while sleep 1; do
         if test $j -gt 30; then
-                echo "bridge initialisation timed out"
+                mstate 1
+                mprint "bridge initialisation timed out"
                 rv=1
                 break
@@ -55 +56 @@
                 test -e "$x" || break 2         # no -> out of both loops
                 # print initialisation message, but once only
-                test $i = 1 || echo \
+                test $i = 1 || mprint -n \
                     "Waiting for bridge initialisation to finish"
                 i=1
@@ -72 +73 @@
         j=$(expr $j + 1)
 done
-test $i = 0 || echo done, took $j seconds 
+test $i = 0 || {
+        mstate $rv
+        mprint "took $j seconds"
+}
 
-mstate $rv
-
-# vim:ts=8
+# vim:ts=4

package/fwifupdown/files/main.sh

@@ -141 +141 @@
         }
 
-        config $RT_PREUP_PRINTING_OFF || [ "$METHOD" = "manual" ] && return
+        config $RT_PREUP_PRINTING_OFF && return
         mup
 }
 
 main_up() {
-        if ! config $RT_UP_IFUP_CHECK_OFF && [ "$METHOD" != "manual" ]
+        [ x"$METHOD" = x"manual" ] && ip link set up dev $IFACE
+
+        if ! config $RT_UP_IFUP_CHECK_OFF
         then
                 is_up
@@ -190 +192 @@
         }
 
-        config $RT_DOWN_PRINTING_OFF || [ "$METHOD" = "manual" ] && return
+        config $RT_DOWN_PRINTING_OFF  && return
         mdown
 }
 
 main_postdown() {
-        if ! config $RT_POSTDOWN_IFDOWN_CHECK_OFF && [ "$METHOD" != "manual" ]
+        [ x"$METHOD" = x"manual" ] && {
+                ip addr flush dev %ifac
+                ip link set down dev $IFACE
+        }
+
+        if ! config $RT_POSTDOWN_IFDOWN_CHECK_OFF
         then
                 if [ $IFACE_STATE = "down" ]