Changeset f90908d in freewrt for package/fwifupdown/files

Timestamp:

Apr 25, 2007, 1:04:46 PM (19 years ago)

Author:

Christian Fischer <spaetzle@…>

Children:

8b73212

Parents:

26cabc0

Message:

changed some more config variables

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

File:

• package/fwifupdown/files/main.sh (modified) (6 diffs)

package/fwifupdown/files/main.sh

@@ -75 +75 @@
                 echo "LASTLOG=0" >> $ENVFILE
 
-                # search for existing lib files end evaluate iface type by using the appropriate
-                # function from lib file
-                for lib in ${LIBDIR}/* ${LIBDIR_OVERLAY}/*
-                do
-                        if [ -f $lib ]
-                        then
-                                if (. $lib; iface_type 2>&-)
+                if [ "$IFACE" != "lo" ]
+                then
+                        # search for existing lib files end evaluate iface type by using the appropriate
+                        # function from lib file
+                        for lib in ${LIBDIR}/* ${LIBDIR_OVERLAY}/*
+                        do
+                                if [ -f $lib ]
                                 then
-                                        if [ "$lastmatch" != "" ]
+                                        if (. $lib; iface_type 2>&-)
                                         then
-                                                if [ "$(basename $lib)" = "$(basename $lastmatch)" ]
+                                                if [ "$lastmatch" != "" ]
                                                 then
-                                                        logger "Warning: $lib overlays $lastmatch"
-                                                else
-                                                        logger "Error: iface type $lib overlays $lastmatch"
+                                                        if [ "$(basename $lib)" = "$(basename $lastmatch)" ]
+                                                        then
+                                                                logger "Warning: $lib overlays $lastmatch"
+                                                        else
+                                                                logger "Error: iface type $lib overlays $lastmatch"
+                                                        fi
                                                 fi
+                                                lastmatch=$lib
                                         fi
-                                        lastmatch=$lib
                                 fi
-                        fi
-                done
+                        done
+                fi
 
                 if [ "$lastmatch" != "" ]
@@ -141 +144 @@
 CFG_DOWN_PRINTING_OFF=0
 CFG_POSTDOWN_PRINTING_OFF=0
-CFG_PREUP_IFUP_CHECK_OFF=0
-CFG_DOWN_IFUP_CHECK_OFF=0
+CFG_IFUP_CHECK_OFF=0
+CFG_IFDOWN_CHECK_OFF=0
 
 if [ -f /etc/conf.d/ifupdown ]; then
@@ -164 +167 @@
 env_update
 
-if [ "IFACE_TYPE" != "iface" ]
+if [ "$IFACE_TYPE" != "iface" ]
 then
         if [ -f "${LIBDIR_OVERLAY}/$IFACE_TYPE" ]
@@ -183 +186 @@
                 config $CFG_PREUP_PRINTING_OFF || mstart
 
-                if ! config $CFG_PREUP_IFUP_CHECK_OFF && is_up
+                if ! config $CFG_IFUP_CHECK_OFF && is_up
                 then
                         if ! config $CFG_PREUP_PRINTING_OFF
@@ -189 +192 @@
                                 mup
                                 mstate 1
-                                minfo "Interface already up, run ifdown ${IFACE} first."
+                                minfo "Interface already up"
                         fi
                         exit 1
@@ -233 +236 @@
                 config $CFG_DOWN_PRINTING_OFF || mstop
 
-                if ! config $CFG_DOWN_IFUP_CHECK_OFF && ! is_up
+                if ! config $CFG_IFDOWN_CHECK_OFF && ! is_up
                 then
                         if ! config $CFG_DOWN_PRINTING_OFF