Changeset 5fade05 in freewrt for package/fwifupdown/files

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

Files:

• ifupdown.sh (modified) (1 diff)
• lladdr (modified) (1 diff)
• main.sh (modified) (2 diffs)
• mfunctions.sh (modified) (1 diff)
• mprint.sh (modified) (7 diffs)

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 "$*"
 }