[Routingtools-cvs] tools/rc.d firewall,1.28,1.29 shaper,1.25,1.26

[Kai K. <hur...@us...>]

Update of /cvsroot/routingtools/tools/rc.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25841

Modified Files:
	firewall shaper 
Log Message:
- improve RedHat detection (fresh installs of newer SuSE version was incorrectly detected)


Index: firewall
===================================================================
RCS file: /cvsroot/routingtools/tools/rc.d/firewall,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** firewall	13 Feb 2004 17:51:27 -0000	1.28
--- firewall	8 Jun 2004 13:11:54 -0000	1.29
***************
*** 23,27 ****
  if [ -r /etc/rc.config ]; then
  	. /etc/rc.config
! else
  	. /etc/rc.d/init.d/functions
  	rc_done=0
--- 23,29 ----
  if [ -r /etc/rc.config ]; then
  	. /etc/rc.config
! fi
! 
! if [ -r /etc/rc.d/init.d/functions ]; then
  	. /etc/rc.d/init.d/functions
  	rc_done=0
***************
*** 345,348 ****
--- 347,353 ----
  #
  # $Log$
+ # Revision 1.29  2004/06/08 13:11:54  hurikhan
+ # - improve RedHat detection (fresh installs of newer SuSE version was incorrectly detected)
+ #
  # Revision 1.28  2004/02/13 17:51:27  hurikhan
  # - changed rp_filter behavior

Index: shaper
===================================================================
RCS file: /cvsroot/routingtools/tools/rc.d/shaper,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** shaper	13 Feb 2004 17:41:55 -0000	1.25
--- shaper	8 Jun 2004 13:11:54 -0000	1.26
***************
*** 21,29 ****
  
  if [ -r /etc/rc.config ]; then
!         . /etc/rc.config
! else
!         . /etc/rc.d/init.d/functions
!         rc_done=0
!         rc_failed=1
  fi
  
--- 21,31 ----
  
  if [ -r /etc/rc.config ]; then
! 	. /etc/rc.config
! fi
! 
! if [ -r /etc/rc.d/init.d/functions ]; then
! 	. /etc/rc.d/init.d/functions
! 	rc_done=0
! 	rc_failed=1
  fi
  
***************
*** 270,273 ****
--- 272,278 ----
  #
  # $Log$
+ # Revision 1.26  2004/06/08 13:11:54  hurikhan
+ # - improve RedHat detection (fresh installs of newer SuSE version was incorrectly detected)
+ #
  # Revision 1.25  2004/02/13 17:41:55  hurikhan
  # - do not use tcp timestamps (reduces packet size and is useless here)