From owner-p4-projects@FreeBSD.ORG  Tue Nov  7 18:48:19 2006
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 A91AC16A47B; Tue,  7 Nov 2006 18:48:19 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 844F816A403
	for <perforce@FreeBSD.org>; Tue,  7 Nov 2006 18:48:19 +0000 (UTC)
	(envelope-from als@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 89A4443D7F
	for <perforce@FreeBSD.org>; Tue,  7 Nov 2006 18:48:11 +0000 (GMT)
	(envelope-from als@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 kA7ImBRn020413
	for <perforce@FreeBSD.org>; Tue, 7 Nov 2006 18:48:11 GMT
	(envelope-from als@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7ImBSV020410
	for perforce@freebsd.org; Tue, 7 Nov 2006 18:48:11 GMT
	(envelope-from als@FreeBSD.org)
Date: Tue, 7 Nov 2006 18:48:11 GMT
Message-Id: <200611071848.kA7ImBSV020410@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	als@FreeBSD.org using -f
From: Alex Lyashkov <als@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 109462 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: Tue, 07 Nov 2006 18:48:19 -0000

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

Change 109462 by als@als_head on 2006/11/07 18:47:58

	disable linker debug.
	add to default in for jail only kernel_linker_file. other modules only
	init jail_0 and must be kldloaded when need init selected context.

Affected files ...

.. //depot/projects/jail2/sys/kern/kern_linker.c#7 edit

Differences ...

==== //depot/projects/jail2/sys/kern/kern_linker.c#7 (text+ko) ====

@@ -31,8 +31,6 @@
 #include "opt_hwpmc_hooks.h"
 #include "opt_mac.h"
 
-#define KLD_DEBUG
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -67,7 +65,7 @@
 #endif
 
 #ifdef KLD_DEBUG
-int kld_debug = 1;
+int kld_debug = 0;
 #endif
 
 #define	KLD_LOCK()		sx_xlock(&kld_sx)
@@ -365,6 +363,26 @@
 }
 
 static void
+linker_file_register_jaildefault(linker_file_t lf)
+{
+	struct jailinit **start, **stop, **sipp;
+
+	KLD_DPF(FILE,
+	    ("linker_file_register_jaildefault: registering default for jail."
+	     "file %s\n", lf->filename));
+
+	if (linker_file_lookup_set(lf, "jailinit_set", &start, &stop, NULL) != 0)
+		return;
+
+	for (sipp = start; sipp < stop; sipp++) {
+		if ((*sipp)->subsystem == SI_SUB_DUMMY)
+			continue;	/* skip dummy task(s) */
+
+		jailsysinit_add(*sipp);
+	}
+}
+
+static void
 linker_file_jailuninit(linker_file_t lf, struct prison *pr)
 {
 	struct jailinit **start, **stop, **sipp, **xipp, *save;
@@ -394,8 +412,6 @@
 		if ((*sipp)->subsystem == SI_SUB_DUMMY)
 			continue;	/* skip dummy task(s) */
 
-		if (!pr_jailed(pr))
-			jailsysinit_del(*sipp);
 		/* Call function */
 		(*((*sipp)->fini)) (pr);
 	}
@@ -490,6 +506,7 @@
 
 	linker_file_register_modules(linker_kernel_file);
 #ifdef JAIL
+	linker_file_register_jaildefault(linker_kernel_file);
 	linker_file_register_jailinit(linker_kernel_file, &jail_0);
 #endif
 }