Changeset d839dc6 in freewrt

Timestamp:

Jun 12, 2007, 1:34:33 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

5dcdc822

Parents:

8d6d884

Message:

• dhcp method: run as 'up' not as 'pre_up', because we must set the interface to up to work (I still don't get an address…)
• lladdr plugin: new, use something like | auto eth0.1 | iface eth0.1 inet dhcp | switch-ports 0 5 | broadcast + | lladdr 00:17:31:d6:9d:ae to use this (note: the format string is checked)
• main.sh: fix running of plugins
• Makefile: install lladdr plugin, bump dashver

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

Location:

package/fwifupdown

Files:

• Makefile (modified) (2 diffs)
• files/lladdr (added)
• files/main.sh (modified) (1 diff)
• lib/dhcp (modified) (1 diff)

package/fwifupdown/Makefile

@@ -9 +9 @@
 PKG_NAME:=                      fwifupdown
 PKG_VERSION:=                   0.2
-PKG_RELEASE:=                   11
+PKG_RELEASE:=                   12
 PKG_SRC_ROOT:=                  ${TOPDIR}/package/${PKG_NAME}
 PKG_CONFIG_IDIR:=               lib/network
@@ -52 +52 @@
         ${INSTALL_DATA} ${PKG_SRC_ROOT}/lib/dhcp ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_METHSDIR}
         ${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_OVL}/
 
 ifeq (${FWIFUPDOWN_CONFIG_BRIDGE},y)

package/fwifupdown/files/main.sh

@@ -297 +297 @@
 
 main_exec_plugins() {
-        for plugin in ${LIBDIR_OVERLAY}/plugins/* ${LIBDIR}/plugins/*
-        do
-                [ -f $plugin ] || return 0
+        for plugin in ${LIBDIR_OVERLAY}/plugins/* ${LIBDIR}/plugins/*; do
+                [ -f $plugin ] || continue
                 . $plugin
-                eval "${plugin}_${1}" 2>&-
+                eval "${plugin##*/}_${1}" 2>&-
                 retval=$?
                 [ $retval != 0 -a $retval != 127 ] && exit 1
-                return
         done
 }

package/fwifupdown/lib/dhcp

@@ -9 +9 @@
 
 
-method_preup() {
+method_up() {
         dhcp_up || exit 1