From owner-p4-projects@FreeBSD.ORG  Wed Jan 10 12:12:30 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F97616A407; Wed, 10 Jan 2007 12:12:30 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2B1F416A416
	for <perforce@FreeBSD.org>; Wed, 10 Jan 2007 12:12:30 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DA5B13C45D
	for <perforce@FreeBSD.org>; Wed, 10 Jan 2007 12:12:30 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0ACCTeV028425
	for <perforce@FreeBSD.org>; Wed, 10 Jan 2007 12:12:30 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0ACCT1L028422
	for perforce@freebsd.org; Wed, 10 Jan 2007 12:12:29 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Wed, 10 Jan 2007 12:12:29 GMT
Message-Id: <200701101212.l0ACCT1L028422@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 112705 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jan 2007 12:12:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=112705

Change 112705 by rdivacky@rdivacky_witten on 2007/01/10 12:11:59

	Inherit setting of the default emulation version to the jails.
	
	Pointed out by: jhb

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#7 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#7 (text+ko) ====

@@ -233,7 +233,7 @@
 {
 	struct prison *pr;
 	struct linux_prison *lpr;
-	int use26 = 0;		/* defaults to off */
+	int use26 = linux_use_linux26;
 
 	pr = td->td_ucred->cr_prison;
 	if (pr != NULL) {
@@ -241,8 +241,7 @@
 			lpr = (struct linux_prison *)pr->pr_linux;
 			use26 = lpr->pr_use_linux26;
 		}
-	} else
-		use26 = linux_use_linux26;
+	}
 	
 	return (use26);
 }