[Midnightbsd-cvs] src [11371] check if in a jail
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 6 09:52:44 EDT 2018
Revision: 11371
http://svnweb.midnightbsd.org/src/?rev=11371
Author: laffer1
Date: 2018-07-06 09:52:43 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
check if in a jail
Modified Paths:
--------------
trunk/libexec/save-entropy/Makefile
trunk/libexec/save-entropy/save-entropy.sh
Property Changed:
----------------
trunk/libexec/save-entropy/save-entropy.sh
Modified: trunk/libexec/save-entropy/Makefile
===================================================================
--- trunk/libexec/save-entropy/Makefile 2018-07-06 13:51:57 UTC (rev 11370)
+++ trunk/libexec/save-entropy/Makefile 2018-07-06 13:52:43 UTC (rev 11371)
@@ -1,5 +1,5 @@
-# $FreeBSD: src/libexec/save-entropy/Makefile,v 1.4 2004/12/21 08:46:52 ru Exp $
# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/save-entropy/Makefile 139103 2004-12-21 08:47:35Z ru $
SCRIPTS= save-entropy.sh
NO_OBJ=
Modified: trunk/libexec/save-entropy/save-entropy.sh
===================================================================
--- trunk/libexec/save-entropy/save-entropy.sh 2018-07-06 13:51:57 UTC (rev 11370)
+++ trunk/libexec/save-entropy/save-entropy.sh 2018-07-06 13:52:43 UTC (rev 11371)
@@ -24,8 +24,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/libexec/save-entropy/save-entropy.sh,v 1.3.2.1 2006/09/01 23:58:46 dougb Exp $
# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/save-entropy/save-entropy.sh 269220 2014-07-29 06:00:16Z delphij $
# This script is called by cron to store bits of randomness which are
# then used to seed /dev/random on boot.
@@ -43,6 +43,8 @@
. /etc/rc.conf 2>/dev/null
fi
+[ $(/sbin/sysctl -n security.jail.jailed) = 0 ] || exit 0
+
case ${entropy_dir} in
[Nn][Oo])
exit 0
Property changes on: trunk/libexec/save-entropy/save-entropy.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list