From owner-svn-src-all@FreeBSD.ORG  Wed Jul 16 19:02:31 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3EDBCE29;
 Wed, 16 Jul 2014 19:02:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C53627CB;
 Wed, 16 Jul 2014 19:02:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GJ2Vpt048946;
 Wed, 16 Jul 2014 19:02:31 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GJ2VMG048945;
 Wed, 16 Jul 2014 19:02:31 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201407161902.s6GJ2VMG048945@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Wed, 16 Jul 2014 19:02:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268773 - head/usr.sbin/service
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jul 2014 19:02:31 -0000

Author: dteske
Date: Wed Jul 16 19:02:30 2014
New Revision: 268773
URL: http://svnweb.freebsd.org/changeset/base/268773

Log:
  Revert previous revision (r268461) for reasons documented in PR.
  To use tmux in an rc.d script, use the new-session flag "-d".
  To use screen in an rc.d script, use the "-dm" flag.
  If you really need to launch an attached session, manually
  export TERM=xterm (FreeBSD 9.0 or higher) or export TERM=cons25
  for older releases.
  
  Reported by:	bdrewery
  Discussed on:	src-committers, svn-src-all, svn-src-head
  PR:		bin/191869

Modified:
  head/usr.sbin/service/service.sh

Modified: head/usr.sbin/service/service.sh
==============================================================================
--- head/usr.sbin/service/service.sh	Wed Jul 16 18:52:21 2014	(r268772)
+++ head/usr.sbin/service/service.sh	Wed Jul 16 19:02:30 2014	(r268773)
@@ -139,7 +139,7 @@ cd /
 for dir in /etc/rc.d $local_startup; do
 	if [ -x "$dir/$script" ]; then
 		[ -n "$VERBOSE" ] && echo "$script is located in $dir"
-		exec env -i HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin TERM="$TERM" $dir/$script $*
+		exec env -i HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin $dir/$script $*
 	fi
 done