Changeset 8ebd04e in freewrt for package/fwifupdown/files


Ignore:
Timestamp:
Apr 20, 2007, 4:21:48 PM (19 years ago)
Author:
Christian Fischer <spaetzle@…>
Children:
3d9f8d6
Parents:
f8c14cc
Message:

some fixes to get set -u working

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

Location:
package/fwifupdown/files
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • package/fwifupdown/files/ifupdown.sh

    rf8c14cc r8ebd04e  
    77# Christian Fischer <spaetzle@freewrt.org>
    88#
     9
     10set -u
    911
    1012case $(basename $0) in
    … …  
    1921        ;;
    2022esac
     23
     24CFG_BUSYBOX_COMPAT=0
    2125
    2226if [ -f /etc/conf.d/ifupdown ]

  • package/fwifupdown/files/main.sh

    rf8c14cc r8ebd04e  
    88#
    99
     10set -u
    1011
    1112builtin() {
    … …  
    129130### main entry point ###
    130131
    131 alias exit="__exit"
    132 alias ifup="__ifupdown ifup"
    133 alias ifdown="__ifupdown ifdown"
     132CFG_PRINTING_OFF=0
     133CFG_SYSLOG_OFF=0
     134CFG_BUSYBOX_COMPAT=0
     135CFG_START_PRINTING_OFF=0
     136CFG_STOP_PRINTING_OFF=0
     137CFG_PREUP_IFUP_CHECK_OFF=0
     138CFG_UP_IFUP_CHECK_OFF=0
     139CFG_DOWN_IFUP_CHECK_OFF=0
     140CFG_POSTDOWN_IFUP_CHECK_OFF=0
    134141
    135142if [ -f /etc/conf.d/ifupdown ]; then
    136143        . /etc/conf.d/ifupdown
    137         [ "$CFG_BUSYBOX_COMPAT" = "1" ] && builtin exit 1
     144        [ "$CFG_BUSYBOX_COMPAT" = "1" ] && exit 1
    138145else
    139         builtin exit 1
     146        exit 1
    140147fi
    141 
    142 . /opt/ifupdown/bin/mfunctions.sh
    143 
    144148
    145149ENVFILE="/tmp/ifupdown/env"             # some kind of ipc
    146150LIBDIR="/opt/ifupdown/lib"              # library directory
    147151LIBDIR_OVERLAY="/etc/network/lib"       # library overlay directory inside fwcf
    148 
    149152# IFACE                 # interface name, passed from busybox
    150153# IF_FOO*               # interface config vars form /etc/network/interfaces, passed from busybox
    … …  
    153156# PATH                  # $PATH, passed from busybox
    154157# IFUPDOWN_ENV  # $IFUPDOWN_ENV, passed from busybox
    155 IFACE_TYPE=""   # interface type
     158IFACE_TYPE="none"       # interface type
    156159# H_ERR                 # handler error
    157160# MODE                  # passed from busybox (start, stop)
    158161# SUBMODE               # submode (if-pre-up, if-up, if-down, if-post-down)
    159162
    160 : ${CFG_PRINTING_OFF:=0}
    161 : ${CFG_SYSLOG_OFF:=0}
    162 : ${CFG_START_PRINTING_OFF:=0}
    163 : ${CFG_STOP_PRINTING_OFF:=0}
    164 : ${CFG_PREUP_IFUP_CHECK_OFF:=0}
    165 : ${CFG_UP_IFUP_CHECK_OFF:=0}
    166 : ${CFG_DOWN_IFUP_CHECK_OFF:=0}
    167 : ${CFG_POSTDOWN_IFUP_CHECK_OFF:=0}
    168 
    169 
     163alias exit="__exit"
     164alias ifup="__ifupdown ifup"
     165alias ifdown="__ifupdown ifdown"
     166
     167. /opt/ifupdown/bin/mfunctions.sh
    170168
    171169env_update
    … …  
    184182fi
    185183
    186 [ "$H_ERR" = "1" ] && builtin exit 1
     184[ "${H_ERR:=""}" = "1" ] && builtin exit 1
    187185
    188186case $SUBMODE in

  • package/fwifupdown/files/mprint.sh

    rf8c14cc r8ebd04e  
    3232                opt='-ne'
    3333#               msg="${MPREFIX}${STARTCOL}${MCOLOR}${1}"
    34                 msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${MCOLOR}${1}"
     34                msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${1}"
    3535
    3636                logmsg=$1
    … …  
    4141                opt='-e'
    4242                #msg="${MPREFIX}${STARTCOL}${MCOLOR}${1} ..."
    43                 msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${MCOLOR}${1} ..."
     43                msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${1} ..."
    4444                logmsg=$1
    4545                ;;
    … …  
    6767        esac
    6868
    69         config $FWIFUD_RT_STDOUT && echo $opt ${msg}${NORMAL}
     69        config $CFG_PRINTING_OFF || echo $opt ${msg}${NORMAL}
    7070
    71         if config $FWIFUD_RT_SYSLOG
    72         then
     71#       if config $FWIFUD_RT_SYSLOG
     72#       then
    7373        #       if config $savelastlog
    7474        #       then
    … …  
    7878        #               logger -t ifupdown "$LASTLOG : $logmsg"
    7979        #       fi
    80         fi
     80#       fi
    8181       
    8282        MPREFIX=$MP_GOOD
Note: See TracChangeset for help on using the changeset viewer.