Changeset ad56710 in freewrt

Timestamp:

Jun 26, 2007, 11:42:09 PM (18 years ago)

Author:

Christian Fischer <spaetzle@…>

Children:

e607b9b

Parents:

10cbe1c

Message:

• added back method manual to the valid methods
• moved lladdr to the right place, this is cosmetic
• removed /etc/init.d/ifupdown, nobody needs this
• removed zero size file wl-broadcom
• fixed fwifupdown Makefile changes from tg@

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

Location:

package

Files:

• broadcom-wl/Makefile (modified) (1 diff)
• broadcom-wl/files/wl-broadcom (modified) (2 diffs)
• fwifupdown/Makefile (modified) (2 diffs)
• fwifupdown/files/ifupdown.init (deleted)
• fwifupdown/files/main.sh (modified) (3 diffs)
• fwifupdown/lib/alias (modified) (1 diff)
• fwifupdown/lib/lladdr (moved) (moved from package/fwifupdown/files/lladdr )
• fwifupdown/lib/wl-broadcom (deleted)

package/broadcom-wl/Makefile

@@ -9 +9 @@
 PKG_NAME:=              broadcom-wl
 PKG_VERSION:=           4.80.53.0
-PKG_RELEASE:=           3
+PKG_RELEASE:=           4
 PKG_MD5SUM:=            a7d8dde3ce474c361143b83e1d9890b1
 PKG_MODULE:=            11

package/broadcom-wl/files/wl-broadcom

@@ -345 +345 @@
 
 if_down() {
+        mdestroy
         init_debug wlc ifname $IFACE maclist none
         init_debug wlc ifname $IFACE radio 0
@@ -351 +352 @@
         pid="$(cat /var/run/nas.lan.pid 2>&-)"
         [ -n "$pid" -a -d "/proc/$pid" ] && kill $pid
-
+        
+        mstate 0
         return 0
 }

package/fwifupdown/Makefile

@@ -9 +9 @@
 PKG_NAME:=                      fwifupdown
 PKG_VERSION:=                   0.2
-PKG_RELEASE:=                   23
+PKG_RELEASE:=                   24
 PKG_SRC_ROOT:=                  ${TOPDIR}/package/${PKG_NAME}
 PKG_CONFIG_WORKDIR:=            etc/network
@@ -38 +38 @@
         ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/mprint.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}
         ${INSTALL_BIN} ${PKG_SRC_ROOT}/files/main.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/fwifupdown.main
+        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/sbin
         ${INSTALL_BIN} ${PKG_SRC_ROOT}/files/ifupdown.sh ${IDIR_FWIFUPDOWN}/sbin/ifup
         cd ${IDIR_FWIFUPDOWN}/sbin && ln -s ifup ifdown
-        ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/ifupdown.init ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_INITDIR}/ifupdown
-        ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/lladdr ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_PLUGDIR}/
+        ${INSTALL_DATA} ${PKG_SRC_ROOT}/lib/lladdr ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_PLUGDIR}/
 
 ifeq (${FWIFUPDOWN_CONFIG_BRIDGE},y)

package/fwifupdown/files/main.sh

@@ -141 +141 @@
         }
 
-        config $RT_PREUP_PRINTING_OFF || mup
+        config $RT_PREUP_PRINTING_OFF || [ "$METHOD" = "manual" ] && return
+        mup
 }
 
 main_up() {
-        if ! config $RT_UP_IFUP_CHECK_OFF
+        if ! config $RT_UP_IFUP_CHECK_OFF && [ "$METHOD" != "manual" ]
         then
                 is_up
                 retval=$?
-
-                if [ x"$retval" != x"0" ]
-                then
-
-                        if ! config $RT_UP_PRINTING_OFF
-                        then
-                                mstate $retval
-                                [ "$METHOD" = "manual" ] && minfo "Method manual is set"
-                        fi
-                        exit 1
-                else
-                        config $RT_UP_PRINTING_OFF || mstate $retval
-                fi
+                config $RT_UP_PRINTING_OFF || mstate $retval
+                [ x"$retval" != x"0" ] && exit 1
         fi
 
@@ -200 +190 @@
         }
 
-        config $RT_DOWN_PRINTING_OFF || mdown
+        config $RT_DOWN_PRINTING_OFF || [ "$METHOD" = "manual" ] && return
+        mdown
 }
 
 main_postdown() {
-        if ! config $RT_POSTDOWN_IFDOWN_CHECK_OFF
+        if ! config $RT_POSTDOWN_IFDOWN_CHECK_OFF && [ "$METHOD" != "manual" ]
         then
                 if [ $IFACE_STATE = "down" ]
@@ -215 +206 @@
                         fi
                 else
-                        if is_up
-                        then
-                                if ! config $RT_POSTDOWN_PRINTING_OFF
-                                then
-                                        mstate 1
-                                        [ "$METHOD" = "manual" ] && minfo "Method manual is set"
-                                fi
-                                return 1
-                        else
-                                config $RT_POSTDOWN_PRINTING_OFF || mstate 0
-                        fi
+                        is_up && retval=1 || retval=0
+                        config $RT_POSTDOWN_PRINTING_OFF || mstate $retval
+                        [ "$retval" != "0" ] && exit 1
                 fi
         fi

package/fwifupdown/lib/alias

@@ -27 +27 @@
         if [ $METHOD != "static" ]
         then
+                mup
                 mstate 1
                 merr "Methods other than static makes no sense for alias ifaces"