From owner-freebsd-rc@FreeBSD.ORG  Mon Jan 25 20:09:51 2010
Return-Path: <owner-freebsd-rc@FreeBSD.ORG>
Delivered-To: freebsd-rc@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E2591065672
	for <freebsd-rc@freebsd.org>; Mon, 25 Jan 2010 20:09:51 +0000 (UTC)
	(envelope-from emaste@freebsd.org)
Received: from mail2.sandvine.com (Mail1.sandvine.com [64.7.137.134])
	by mx1.freebsd.org (Postfix) with ESMTP id DC4948FC18
	for <freebsd-rc@freebsd.org>; Mon, 25 Jan 2010 20:09:50 +0000 (UTC)
Received: from labgw2.phaedrus.sandvine.com ([192.168.3.11]) by
	mail2.sandvine.com with Microsoft SMTPSVC(6.0.3790.3959); 
	Mon, 25 Jan 2010 14:57:48 -0500
Received: by labgw2.phaedrus.sandvine.com (Postfix, from userid 10332)
	id 91E311170D; Mon, 25 Jan 2010 14:57:48 -0500 (EST)
Date: Mon, 25 Jan 2010 14:57:48 -0500
From: Ed Maste <emaste@freebsd.org>
To: freebsd-rc@freebsd.org
Message-ID: <20100125195748.GA30798@sandvine.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.2.1i
X-OriginalArrivalTime: 25 Jan 2010 19:57:48.0344 (UTC)
	FILETIME=[AB370380:01CA9DF8]
Subject: NetBSD compat shims in rc.subr
X-BeenThere: freebsd-rc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Discussion related to /etc/rc.d design and implementation."
	<freebsd-rc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-rc>
List-Post: <mailto:freebsd-rc@freebsd.org>
List-Help: <mailto:freebsd-rc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2010 20:09:51 -0000

There's a vestigial bit of NetBSD compat shim in rc.subr that I'd
like to clean up; any objections to the patch below?

Index: etc/rc.subr
===================================================================
--- etc/rc.subr	(revision 202731)
+++ etc/rc.subr	(working copy)
@@ -52,22 +52,12 @@
 
 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
 #	---------