[BACK]Return to netstart CVS log [TXT][DIR] Up to [local] / src / etc

Diff for /src/etc/netstart between version 1.54 and 1.55

version 1.54, 1999/12/31 04:32:53 version 1.55, 2000/01/02 04:38:17
Line 66 
Line 66 
     # Interface names must be alphanumeric only.  We check to avoid      # Interface names must be alphanumeric only.  We check to avoid
     # configuring backup or temp files, and to catch the "*" case.      # configuring backup or temp files, and to catch the "*" case.
     if ! isalphanumeric "$if"; then      if ! isalphanumeric "$if"; then
         continue          continue
     fi      fi
     ifconfig $if > /dev/null 2>&1      ifconfig $if > /dev/null 2>&1
     if [ "$?" != "0" ]; then      if [ "$?" != "0" ]; then
Line 74 
Line 74 
     fi      fi
   
     # Now parse the hostname.* file      # Now parse the hostname.* file
     {      while :; do
         read af name mask bcaddr extras          if [ "$cmd2" ]; then
               # we are carrying over from the 'read dt dtaddr' last time
               set -- $cmd2
               af="$1" name="$2" mask="$3" bcaddr="$4" ext1="$5" ext2="$6"
               cmd2=
           else
               # read the next line or exit the while loop
               read af name mask bcaddr ext1 ext2 || break
           fi
           # skip comments
           [ "${af#*#}" = "${af}" ] || continue
         # $af can be either "dhcp", "up" or an address family.          # $af can be either "dhcp", "up" or an address family.
         case "$af" in          case "$af" in
         "bridge")          "bridge")
             cmd="echo ${hn}: bridges now supported via bridgename.* files"              cmd="echo ${hn}: bridges now supported via bridgename.* files"
             ;;              ;;
         "dhcp")          "dhcp")
             ifconfig $if $name $mask $bcaddr $extras down              ifconfig $if $name $mask $bcaddr $ext1 $ext2 down
             cmd="dhclient $if"              cmd="dhclient $if"
             ;;              ;;
         "up")          "up")
             # The only one of these guaranteed to be set is $if              # The only one of these guaranteed to be set is $if
             # the remaining ones exist so that media controls work              # the remaining ones exist so that media controls work
             cmd="ifconfig $if $name $mask $bcaddr $extras up"              cmd="ifconfig $if $name $mask $bcaddr $ext1 $ext2 up"
             ;;  
         *)  
             read dt dtaddr  
             if [ ! -n "$name" ]; then  
                 echo "/etc/hostname.$if: invalid network configuration file"  
                 continue  
             fi  
   
             cmd="ifconfig $if $af $name "  
             if [ "${dt}" = "dest" ]; then cmd="$cmd $dtaddr"; fi  
             if [ -n "$mask" ]; then cmd="$cmd netmask $mask"; fi  
             if [ -n "$bcaddr" -a "X$bcaddr" != "XNONE" ]; then  
                 cmd="$cmd broadcast $bcaddr";  
             fi  
             cmd="$cmd $extras";  
             ;;              ;;
           *)
               read dt dtaddr
               if [ "$name"  = "alias" ]; then
                   # perform a 'shift' of sorts
                   alias=$name
                   name=$mask
                   mask=$bcaddr
                   bcaddr=$ext1
                   ext1=$ext2
                   ext2=
               fi
               cmd="ifconfig $if $af $alias $name "
               case $dt in
               dest)
                   cmd="$cmd $dtaddr"
                   ;;
               [a-z]*)
                   cmd2="$dt $dtaddr"
                   ;;
                esac
                if [ ! -n "$name" ]; then
                       echo "/etc/hostname.$if: invalid network configuration file"
                   return
                fi
                case $af in
                inet)
                   [ "$mask" ] && cmd="$cmd netmask $mask"
                   if [ "$bcaddr" -a "X$bcaddr" != "XNONE" ]; then
                       cmd="$cmd broadcast $bcaddr"
                   fi
                   [ "$alias" ] && rtcmd="; route -n add -host $name 127.0.0.1"
                ;;
                inet6) [ "$mask" ] && cmd="$cmd prefixlen $mask"
                   cmd="$cmd $bcaddr"
                   ;;
                *) cmd="$cmd $mask $bcaddr"
                esac
                cmd="$cmd $ext1 $ext2$rtcmd" rtcmd=
                ;;
         esac          esac
   
         eval "$cmd"          eval "$cmd"
     } < /etc/hostname.$if      done < /etc/hostname.$if
 done  done
 for bn in /etc/bridgename.*; do  for bn in /etc/bridgename.*; do
     # Strip off /etc/bridgename. prefix      # Strip off /etc/bridgename. prefix
Legend:
Removed from v.1.54  
changed lines
  Added in v.1.55