Ignore:
Timestamp:
Nov 11, 2007 3:46:00 AM (6 years ago)
Author:
dkg
Message:

vblade-persist: change all instances of INTERFACE to NETIF for consistency.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/vblade-persist/src/vblade-persist

    r693 r694  
    6969    SHELF="$1" 
    7070    SLOT="$2" 
    71     INTERFACE="$3" 
     71    NETIF="$3" 
    7272    SOURCE="$4" 
    7373 
    7474    verify_shelf "$SHELF" || fatal "not a valid shelf: '$SHELF'" 
    7575    verify_slot "$SLOT" || fatal "not a valid shelf: '$SLOT'" 
    76     verify_interface "$INTERFACE" || fatal "not a valid interface: '$INTERFACE'" 
     76    verify_interface "$NETIF" || fatal "not a valid interface: '$NETIF'" 
    7777    verify_source "$SOURCE" || fatal "not a valid source: '$SOURCE'" 
    7878 
     
    9393    echo "$SHELF" > "$VDIR/$DNAME/env/SHELF" 
    9494    echo "$SLOT" > "$VDIR/$DNAME/env/SLOT" 
    95     echo "$INTERFACE" > "$VDIR/$DNAME/env/INTERFACE" 
     95    echo "$NETIF" > "$VDIR/$DNAME/env/NETIF" 
    9696    echo "$SOURCE" > "$VDIR/$DNAME/env/SOURCE" 
    9797 
     
    105105    echo -e '#shelf slot netif source auto stat' 
    106106    for dev in `ls "$VDIR"` ; do 
    107          echo $(cat "$VDIR/$dev/env/SHELF" "$VDIR/$dev/env/SLOT" "$VDIR/$dev/env/INTERFACE" "$VDIR/$dev/env/SOURCE") $( [ -e "$VDIR/$dev/down" ] && echo 'no')auto $(cat "$VDIR/$dev/supervise/stat") 
     107         echo $(cat "$VDIR/$dev/env/SHELF" "$VDIR/$dev/env/SLOT" "$VDIR/$dev/env/NETIF" "$VDIR/$dev/env/SOURCE") $( [ -e "$VDIR/$dev/down" ] && echo 'no')auto $(cat "$VDIR/$dev/supervise/stat") 
    108108    done 
    109109} 
     
    153153            svall "$1" 
    154154        else 
    155             verify_shelf "$2" || fatal "Not a valid shelf: $2" 
    156             verify_slot "$3" || fatal "Not a valid slot: $3" 
     155            verify_shelf "$2" || fatal "Not a valid shelf: '$2'" 
     156            verify_slot "$3" || fatal "Not a valid slot: '$3'" 
    157157            svcommand "$1" "$VDIR/e$2.$3" 
    158158        fi 
     
    162162            autoall "$1" 
    163163        else 
    164             verify_shelf "$2" || fatal "Not a valid shelf: $2" 
    165             verify_slot "$3" || fatal "Not a valid slot: $3" 
     164            verify_shelf "$2" || fatal "Not a valid shelf: '$2'" 
     165            verify_slot "$3" || fatal "Not a valid slot: '$3'" 
    166166            auto "$1" "$VDIR/e$2.$3" 
    167167        fi 
Note: See TracChangeset for help on using the changeset viewer.