Changeset 5fade05 in freewrt

Timestamp:

Jun 18, 2007, 3:38:49 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

7c3897a

Parents:

22ad630

Message:

• move all the stuff to our /etc structure
• fix lladdr, d'oh

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

Location:

package/fwifupdown

Files:

• Makefile (modified) (4 diffs)
• files/ifupdown.sh (modified) (1 diff)
• files/lladdr (modified) (1 diff)
• files/main.sh (modified) (2 diffs)
• files/mfunctions.sh (modified) (1 diff)
• files/mprint.sh (modified) (7 diffs)
• ipkg/fwifupdown.postinst (added)

package/fwifupdown/Makefile

@@ -9 +9 @@
 PKG_NAME:=                      fwifupdown
 PKG_VERSION:=                   0.2
-PKG_RELEASE:=                   15
+PKG_RELEASE:=                   16
 PKG_SRC_ROOT:=                  ${TOPDIR}/package/${PKG_NAME}
-PKG_CONFIG_IDIR:=               lib/network
 PKG_CONFIG_WORKDIR:=            etc/network
-PKG_CONFIG_CONFDIR:=            etc/conf.d
 PKG_CONFIG_INITDIR:=            etc/init.d
 PKG_CONFIG_BINDIR:=             bin
-PKG_CONFIG_HOOKDIR:=            ${PKG_CONFIG_IDIR}/hook
-PKG_CONFIG_SHDIR:=              ${PKG_CONFIG_IDIR}/sh
 PKG_CONFIG_TYPESDIR:=           ${PKG_CONFIG_WORKDIR}/iftypes
 PKG_CONFIG_METHSDIR:=           ${PKG_CONFIG_WORKDIR}/methods
@@ -29 +25 @@
 
 do-install:
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_CONFDIR}
         ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_INITDIR}
         ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_BINDIR}
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_HOOKDIR}
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_SHDIR}
         ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_TYPESDIR}
         ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_METHSDIR}
@@ -42 +35 @@
         ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-post-down.d
         ${INSTALL_DATA} ${PKG_SRC_ROOT}/lib/alias ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_TYPESDIR}
-        ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/mfunctions.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_SHDIR}
-        ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/mprint.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_SHDIR}
-        ${INSTALL_BIN} ${PKG_SRC_ROOT}/files/main.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_HOOKDIR}
+        ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/mfunctions.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}
+        ${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_BIN} ${PKG_SRC_ROOT}/files/ifupdown.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_BINDIR}
         ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/ifupdown.init ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_INITDIR}/ifupdown
@@ -62 +55 @@
 
 ifeq (${FWIFUPDOWN_CONFIG_PRINTING_OFF},y)
-        echo "CFG_PRINTING_OFF=1" >>  ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_CONFDIR}/ifupdown
+        echo 'add_rcconf "fwifupdown quiet" FWIFUPDOWN_PRINTING_OFF 1' \
+            >>${IDIR_FWIFUPDOWN}/CONTROL/postinst
 endif
 
 ifeq (${FWIFUPDOWN_CONFIG_PRINTING_FANCY},y)
-        echo "CFG_FANCY=1" >> ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_CONFDIR}/ifupdown
+        echo 'add_rcconf "fwifupdown colours" FWIFUPDOWN_FANCY 1' \
+            >>${IDIR_FWIFUPDOWN}/CONTROL/postinst
 endif
 
-        echo "CFG_DEBUG=0" >> ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_CONFDIR}/ifupdown
-        ln -s /${PKG_CONFIG_HOOKDIR}/main.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-pre-up.d/main
-        ln -s /${PKG_CONFIG_HOOKDIR}/main.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-up.d/main
-        ln -s /${PKG_CONFIG_HOOKDIR}/main.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-down.d/main
-        ln -s /${PKG_CONFIG_HOOKDIR}/main.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-post-down.d/main
+        ln -s ../fwifupdown.main ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-pre-up.d/main
+        ln -s ../fwifupdown.main ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-up.d/main
+        ln -s ../fwifupdown.main ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-down.d/main
+        ln -s ../fwifupdown.main ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-post-down.d/main
         ln -s ifupdown.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_BINDIR}/ifup
         ln -s ifupdown.sh ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_BINDIR}/ifdown

package/fwifupdown/files/ifupdown.sh

@@ -21 +21 @@
 esac
 
-[ -f /etc/conf.d/ifupdown ] && . /etc/conf.d/ifupdown
+. /etc/rc.conf
 redirect="2>&-"
 
-if [ x"$CFG_DEBUG" = x"1" ]; then
+if [ x"$FWIFUPDOWN_DEBUG" = x"1" ]; then
         set -x
         redirect=
 fi
 
-eval IFUPDOWN_ENV= $(sed "s/#.*//g" /etc/conf.d/ifupdown) \
+eval IFUPDOWN_ENV= $(grep '^FWIFUPDOWN_' /etc/rc.conf) \
     busybox $what $@ $redirect
 

package/fwifupdown/files/lladdr

@@ -7 +7 @@
 
 lladdr_preup() {
-        [ -z $LLADDR ] && return 0
+        [ -z $IF_LLADDR ] && return 0
         case $IF_LLADDR in
         [0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]) ;;

package/fwifupdown/files/main.sh

@@ -323 +323 @@
 ### main entry point ###
 
-CFG_PRINTING_OFF=0
-CFG_SYSLOG_OFF=0
-CFG_FANCY=0
-CFG_DEBUG=0
-
-if ! [ -f /etc/conf.d/ifupdown ]
-then
-        logger -t ifupdown "/etc/conf.d/ifupdown not found"
-        exit 1
-fi
-. /etc/conf.d/ifupdown
-
-config ${CFG_DEBUG:=""} && set -x
+FWIFUPDOWN_PRINTING_OFF=0
+FWIFUPDOWN_SYSLOG_OFF=0
+FWIFUPDOWN_FANCY=0
+FWIFUPDOWN_DEBUG=0
+
+. /etc/rc.conf
+
+config ${FWIFUPDOWN_DEBUG:=""} && set -x
 
 RT_PREUP_PRINTING_OFF=0
@@ -356 +351 @@
 [ -z "${KSH_VERSION:-""}" ] || alias which='whence -p'
 
-if ! [ -f ${INSTALLDIR}/sh/mfunctions.sh ]
+if ! [ -f /etc/network/mfunctions.sh ]
 then
-        logger -t ifupdown "${INSTALLDIR}/sh/mfunctions.sh not found"
+        logger -t ifupdown "/etc/network/mfunctions.sh not found"
         exit 1
 fi
-. ${INSTALLDIR}/sh/mfunctions.sh
+. /etc/network/mfunctions.sh
 
 main_env_update

package/fwifupdown/files/mfunctions.sh

@@ -12 +12 @@
         exit 1
 fi
-if [ ! -f ${INSTALLDIR}/sh/mprint.sh ]; then
-        logger -t ifupdown "${INSTALLDIR}/sh/mprint.sh not found"
+if [ ! -f /etc/network/mprint.sh ]; then
+        logger -t ifupdown "/etc/network/mprint.sh not found"
         exit 1
 fi
 
-. ${INSTALLDIR}/sh/mprint.sh
+. /etc/network/mprint.sh
 
 mstart() {

package/fwifupdown/files/mprint.sh

@@ -32 +32 @@
                 shift
                 opt='-ne'
-                if config $CFG_FANCY
+                if config $FWIFUPDOWN_FANCY
                 then
                         msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${*}"
@@ -44 +44 @@
                 shift
                 opt='-e'
-                if config $CFG_FANCY
+                if config $FWIFUPDOWN_FANCY
                 then
                         msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${*} ..."
@@ -57 +57 @@
                 case "$1" in
                 0)
-                        if config $CFG_FANCY
+                        if config $FWIFUPDOWN_FANCY
                         then
                                 msg="${FIRSTCOL}${MP_GOOD}${ME_GOOD}"
@@ -66 +66 @@
                         ;;
                 *)
-                        if config $CFG_FANCY
+                        if config $FWIFUPDOWN_FANCY
                         then
                                 msg="${FIRSTCOL}${MP_BAD}${ME_BAD}"
@@ -85 +85 @@
                 color=$1
                 shift
-                if config $CFG_FANCY
+                if config $FWIFUPDOWN_FANCY
                 then
                         msg="${FIRSTCOL}${MP_NONE}${STARTCOL}${color}${*}${NORMAL}"
@@ -95 +95 @@
         esac
 
-        config $CFG_PRINTING_OFF || if config $CFG_FANCY; then
+        config $FWIFUPDOWN_PRINTING_OFF || if config $FWIFUPDOWN_FANCY; then
                 echo $opt ${msg}${NORMAL}
         else
@@ -104 +104 @@
 
 mlogger() {
-        config $CFG_SYSLOG_OFF || logger -t network "$*"
+        config $FWIFUPDOWN_SYSLOG_OFF || logger -t network "$*"
 }