Author: delphij
Date: Tue Jul 22 06:40:27 2014
New Revision: 268979
URL: http://svnweb.freebsd.org/changeset/base/268979
Log:
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)
MFC after: 1 week
Approved by: so (des)
Modified:
head/libexec/save-entropy/save-entropy.sh
Modified: head/libexec/save-entropy/save-entropy.sh
==============================================================================
--- head/libexec/save-entropy/save-entropy.sh Tue Jul 22 04:47:19 2014
(r268978)
+++ head/libexec/save-entropy/save-entropy.sh Tue Jul 22 06:40:27 2014
(r268979)
@@ -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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
