[Linux-decnet-commit] CVS: dnprogs/scripts decnet.sh,1.6,1.7

[Patrick C. <pa...@us...>]

Update of /cvsroot/linux-decnet/dnprogs/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv17926/scripts

Modified Files:
	decnet.sh 
Log Message:
Fixes for Red Hat.


Index: decnet.sh
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/scripts/decnet.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** decnet.sh	18 Oct 2002 09:41:32 -0000	1.6
--- decnet.sh	15 Oct 2003 15:46:53 -0000	1.7
***************
*** 23,29 ****
  # Daemons to start. You may remove the ones you don't want
  #
- prefix=/usr/local
  daemons="dnetd phoned"
  
  #
  # Interfaces to set the MAC address of. If empty all available
--- 23,31 ----
  # Daemons to start. You may remove the ones you don't want
  #
  daemons="dnetd phoned"
  
+ # Prefix for where the progs are installed. This is where the RPM puts them
+ prefix=/usr
+ 
  #
  # Interfaces to set the MAC address of. If empty all available
***************
*** 71,89 ****
       echo -n "Starting DECnet: "
  
!      # Run startnet only if we need to
!      EXEC=`cat /proc/net/decnet | sed -n '2s/ *\([0-9]\.[0-9]\).*[0-9]\.[0-9]/\1/p'`
!      if [ -z "$EXEC" -o "$EXEC" = "0.0" ]
!      then
!        $startnet
!        if [ $? != 0 ]
!        then
!          echo error starting socket layer.
!          exit 1
!        fi
!        NODE=`grep executor /etc/decnet.conf|sed 's/.* \([0-9.]\{3,7\}\) .*/\1/'`
!        echo "$NODE" > /proc/sys/net/decnet/node_address
!        CCT=`grep executor /etc/decnet.conf|sed 's/.*line *//'`
!        echo "$CCT" > /proc/sys/net/decnet/default_device
!      fi
  
       for i in $daemons
--- 73,81 ----
       echo -n "Starting DECnet: "
  
!      NODE=`grep executor /etc/decnet.conf| awk '{print $2}'`
!      echo "$NODE" > /proc/sys/net/decnet/node_address
!      CCT=`grep executor /etc/decnet.conf | awk '{print $6}'`
!      echo "$CCT" > /proc/sys/net/decnet/default_device
!      $prefix/sbin/setether $NODE $CCT
  
       for i in $daemons