[Linux-decnet-commit] CVS: dnprogs/debian changelog,1.24,1.25 dnet-common.init.d,1.6,1.7 dnet-progs.init.d,1.7,1.8

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

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

Modified Files:
	changelog dnet-common.init.d dnet-progs.init.d 
Log Message:
Don't return 1 from init.d in non-fatal circumstances


Index: changelog
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/debian/changelog,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** changelog	5 May 2003 08:31:40 -0000	1.24
--- changelog	6 May 2003 09:57:56 -0000	1.25
***************
*** 1,3 ****
! dnprogs (2.24-1) unstable; urgency=low
  
    * Add library path to dnroute link.
--- 1,11 ----
! dnprogs (2.23.2-1) unstable; urgency=low
! 
!   * Always return 0 from init scripts in case someone installs DECnet
!     when they don't actually want it.
!     Closes: #192052
! 
!  -- Patrick Caulfield <pa...@de...>  Tue,  6 May 2003 08:14:29 +0100
! 
! dnprogs (2.23.1-1) unstable; urgency=low
  
    * Add library path to dnroute link.

Index: dnet-common.init.d
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/debian/dnet-common.init.d,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** dnet-common.init.d	4 May 2003 12:29:03 -0000	1.6
--- dnet-common.init.d	6 May 2003 09:57:57 -0000	1.7
***************
*** 66,70 ****
       then
         echo "DECnet not started as it is not configured."
!        exit 1
       fi
  
--- 66,70 ----
       then
         echo "DECnet not started as it is not configured."
!        exit 0
       fi
  
***************
*** 76,80 ****
         then
           echo "DECnet not started as it is not in the kernel."
! 	 exit 1
         fi
       fi
--- 76,80 ----
         then
           echo "DECnet not started as it is not in the kernel."
! 	 exit 0
         fi
       fi

Index: dnet-progs.init.d
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/debian/dnet-progs.init.d,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** dnet-progs.init.d	4 May 2003 12:29:03 -0000	1.7
--- dnet-progs.init.d	6 May 2003 09:57:57 -0000	1.8
***************
*** 17,21 ****
  if [ ! -f /etc/decnet.conf -o ! -f /proc/net/decnet ]
  then
!   exit 1
  fi
  
--- 17,21 ----
  if [ ! -f /etc/decnet.conf -o ! -f /proc/net/decnet ]
  then
!   exit 0
  fi