Date: Tue, 29 Jul 2014 06:00:49 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r269221 - in stable: 8/libexec/save-entropy 9/libexec/save-entropy Message-ID: <201407290600.s6T60n8V069719@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/8/libexec/save-entropy/save-entropy.sh Directory Properties: stable/8/libexec/save-entropy/ (props changed) Changes in other areas also in this revision: Modified: stable/9/libexec/save-entropy/save-entropy.sh Directory Properties: stable/9/libexec/save-entropy/ (props changed) Modified: stable/8/libexec/save-entropy/save-entropy.sh ============================================================================== --- stable/8/libexec/save-entropy/save-entropy.sh Tue Jul 29 06:00:16 2014 (r269220) +++ stable/8/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407290600.s6T60n8V069719>