From owner-svn-src-all@FreeBSD.ORG  Tue Jul 29 06:00:49 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8E4892F3;
 Tue, 29 Jul 2014 06:00:49 +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 7A8A62973;
 Tue, 29 Jul 2014 06:00:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6T60nPa069635;
 Tue, 29 Jul 2014 06:00:49 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6T60nB4069508;
 Tue, 29 Jul 2014 06:00:49 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201407290600.s6T60nB4069508@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 29 Jul 2014 06:00:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r269221 - in stable: 8/libexec/save-entropy
 9/libexec/save-entropy
X-SVN-Group: stable-9
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: Tue, 29 Jul 2014 06:00:49 -0000

Author: delphij
Date: Tue Jul 29 06:00:48 2014
New Revision: 269221
URL: http://svnweb.freebsd.org/changeset/base/269221

Log:
  MFC r268979:
  
  Don't save entropy inside jails.
  
  As of r126744, we no longer feed the entropy device in jails upon
  start, and collecting them is no longer useful.
  
  PR:		conf/126744
  Submitted by:	Eugene Grosbein <eugen grosbein net> (with minor changes)
  Approved by:	so (des)

Modified:
  stable/9/libexec/save-entropy/save-entropy.sh
Directory Properties:
  stable/9/libexec/save-entropy/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/libexec/save-entropy/save-entropy.sh
Directory Properties:
  stable/8/libexec/save-entropy/   (props changed)

Modified: stable/9/libexec/save-entropy/save-entropy.sh
==============================================================================
--- stable/9/libexec/save-entropy/save-entropy.sh	Tue Jul 29 06:00:16 2014	(r269220)
+++ stable/9/libexec/save-entropy/save-entropy.sh	Tue Jul 29 06:00:48 2014	(r269221)
@@ -42,6 +42,8 @@ elif [ -r /etc/rc.conf ]; then
 	. /etc/rc.conf 2>/dev/null
 fi
 
+[ $(/sbin/sysctl -n security.jail.jailed) = 0 ] || exit 0
+
 case ${entropy_dir} in
 [Nn][Oo])
 	exit 0