svn commit: r212110 - stable/8/etc

[Ed Maste]

Author: emaste
Date: Wed Sep  1 19:36:06 2010
New Revision: 212110
URL: http://svn.freebsd.org/changeset/base/212110

Log:
  MFC r202988, r203022
  
    Remove vestigial NetBSD compatibility shim.
  
    Convert to 2-clause license, from NetBSD rc.subr r1.70.

Modified:
  stable/8/etc/rc.subr

Modified: stable/8/etc/rc.subr
==============================================================================
--- stable/8/etc/rc.subr	Wed Sep  1 19:33:40 2010	(r212109)
+++ stable/8/etc/rc.subr	Wed Sep  1 19:36:06 2010	(r212110)
@@ -15,13 +15,6 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -52,22 +45,12 @@ _rc_subr_loaded="YES"
 
 SYSCTL="/sbin/sysctl"
 SYSCTL_N="${SYSCTL} -n"
-CMD_OSTYPE="${SYSCTL_N} kern.ostype"
-OSTYPE=`${CMD_OSTYPE}`
+SYSCTL_W="${SYSCTL}"
 ID="/usr/bin/id"
 IDCMD="if [ -x $ID ]; then $ID -un; fi"
 PS="/bin/ps -ww"
 JID=`$PS -p $$ -o jid=`
 
-case ${OSTYPE} in
-FreeBSD)
-	SYSCTL_W="${SYSCTL}"
-	;;
-NetBSD)
-	SYSCTL_W="${SYSCTL} -w"
-	;;
-esac
-
 #
 #	functions
 #	---------