From owner-cvs-src@FreeBSD.ORG  Thu May  4 16:17:49 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7A1E016A418;
	Thu,  4 May 2006 16:17:49 +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 47A2D43D77;
	Thu,  4 May 2006 16:17:49 +0000 (GMT) (envelope-from flz@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44GHnsf036461;
	Thu, 4 May 2006 16:17:49 GMT (envelope-from flz@repoman.freebsd.org)
Received: (from flz@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44GHnKl036454;
	Thu, 4 May 2006 16:17:49 GMT (envelope-from flz)
Message-Id: <200605041617.k44GHnKl036454@repoman.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Thu, 4 May 2006 16:17:48 +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/etc/rc.d jail src/share/man/man5 rc.conf.5
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 May 2006 16:17:49 -0000

flz         2006-05-04 16:17:48 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    etc/rc.d             jail 
    share/man/man5       rc.conf.5 
  Log:
  MFC:
  
    - Add following global jail options, used if no jail-specific options are
    set:
     * jail_mount_enable
     * jail_devfs_ruleset
     * jail_devfs_enable
     * jail_fdescfs_enable
     * jail_procfs_enable
     * jail_fstab
     * jail_flags
    - Add a jail_interface / jail_<jid>_interface option. An ip alias will be
    created (jail_<jid>_ip) on jail_interface or jail_<jid>_interface if set.
    This is not a mandatory option.
    - Document all missing jail_* options in rc.conf(5).
  
        src/share/man/man5/rc.conf.5: rev 1.289 -> 1.290
        src/etc/rc.d/jail: rev 1.26 -> 1.27
  
  Approved by:    re (scottl)
  
  Revision    Changes    Path
  1.23.2.4    +17 -9     src/etc/rc.d/jail
  1.256.2.21  +177 -6    src/share/man/man5/rc.conf.5