From owner-svn-src-stable-10@freebsd.org  Tue Jan 12 05:55:29 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93A89A6C81A;
 Tue, 12 Jan 2016 05:55:29 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 6405010D3;
 Tue, 12 Jan 2016 05:55:29 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0C5tSPa055427;
 Tue, 12 Jan 2016 05:55:28 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0C5tS1u055426;
 Tue, 12 Jan 2016 05:55:28 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201601120555.u0C5tS1u055426@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Tue, 12 Jan 2016 05:55:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r293728 - stable/10/usr.sbin/service
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2016 05:55:29 -0000

Author: allanjude
Date: Tue Jan 12 05:55:28 2016
New Revision: 293728
URL: https://svnweb.freebsd.org/changeset/base/293728

Log:
  MFC: r287576
    service(8) -e does not respect /etc/rc.conf.d/* entries
  
  PR:		173454
  Submitted by:	giantlock@gmail.com (original patch)

Modified:
  stable/10/usr.sbin/service/service.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/service/service.sh
==============================================================================
--- stable/10/usr.sbin/service/service.sh	Tue Jan 12 05:53:53 2016	(r293727)
+++ stable/10/usr.sbin/service/service.sh	Tue Jan 12 05:55:28 2016	(r293728)
@@ -71,6 +71,7 @@ if [ -n "$RESTART" ]; then
 		if grep -q ^rcvar $file; then
 			eval `grep ^name= $file`
 			eval `grep ^rcvar $file`
+			load_rc_config_var ${name} ${rcvar}
 			checkyesno $rcvar 2>/dev/null && run_rc_script ${file} stop
 		fi
 	done
@@ -100,6 +101,7 @@ if [ -n "$ENABLED" ]; then
 		if grep -q ^rcvar $file; then
 			eval `grep ^name= $file`
 			eval `grep ^rcvar $file`
+			load_rc_config_var ${name} ${rcvar}
 			checkyesno $rcvar 2>/dev/null && echo $file
 		fi
 	done