From owner-cvs-all@FreeBSD.ORG Tue Jun 6 15:08:03 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 079C016C72E; Tue, 6 Jun 2006 15:06:37 +0000 (UTC) (envelope-from flz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAF2A43D7F; Tue, 6 Jun 2006 15:06:28 +0000 (GMT) (envelope-from flz@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 k56F4dOs079600; Tue, 6 Jun 2006 15:04:39 GMT (envelope-from flz@repoman.freebsd.org) Received: (from flz@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56F4dxE079599; Tue, 6 Jun 2006 15:04:39 GMT (envelope-from flz) Message-Id: <200606061504.k56F4dxE079599@repoman.freebsd.org> From: Florent Thoumie Date: Tue, 6 Jun 2006 15:04:39 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/share/man/man5 rc.conf.5 src/etc/rc.d jail src/etc/defaults rc.conf X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jun 2006 15:08:10 -0000 flz 2006-06-06 15:04:39 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) share/man/man5 rc.conf.5 etc/rc.d jail etc/defaults rc.conf Log: MFC: - Change the "jail_" prefix for internal script variables. This fixes an issue where some global jail_* variables were overriden in the script. [1] - Change "jid" to "jname" in rc.conf(5), since it's more a jail name than a jail id. [1] - Update examples and comments in defaults/rc.conf to advertise new variables and the fact that some of the jail-specific variables may be made jail-global. [2] src/share/man/man5/rc.conf.5: rev 1.293 -> 1.294 src/etc/rc.d/jail: rev 1.31 -> 1.32 src/etc/defaults/rc.conf: rev 1.282 -> 1.283 Reported by: pjd [1], clsung [2] Revision Changes Path 1.252.2.21 +5 -1 src/etc/defaults/rc.conf 1.23.2.7 +102 -91 src/etc/rc.d/jail 1.256.2.23 +33 -33 src/share/man/man5/rc.conf.5