Author: delphij Date: Tue Jul 29 06:00:16 2014 New Revision: 269220 URL: http://svnweb.freebsd.org/changeset/base/269220
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/10/libexec/save-entropy/save-entropy.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/save-entropy/save-entropy.sh ============================================================================== --- stable/10/libexec/save-entropy/save-entropy.sh Tue Jul 29 05:49:16 2014 (r269219) +++ stable/10/libexec/save-entropy/save-entropy.sh Tue Jul 29 06:00:16 2014 (r269220) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"