From owner-freebsd-bugs@FreeBSD.ORG Fri Jun 9 16:30:08 2006 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BA2116A41B for ; Fri, 9 Jun 2006 16:30:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E26EB43D73 for ; Fri, 9 Jun 2006 16:30:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k59GU77G046600 for ; Fri, 9 Jun 2006 16:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k59GU79r046599; Fri, 9 Jun 2006 16:30:07 GMT (envelope-from gnats) Resent-Date: Fri, 9 Jun 2006 16:30:07 GMT Resent-Message-Id: <200606091630.k59GU79r046599@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, skv@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 290A316A41A for ; Fri, 9 Jun 2006 16:23:53 +0000 (UTC) (envelope-from skv@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F060743D72 for ; Fri, 9 Jun 2006 16:23:52 +0000 (GMT) (envelope-from skv@FreeBSD.org) Received: from freefall.freebsd.org (skv@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k59GNqnd046316 for ; Fri, 9 Jun 2006 16:23:52 GMT (envelope-from skv@freefall.freebsd.org) Received: (from skv@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k59GNqQe046315; Fri, 9 Jun 2006 16:23:52 GMT (envelope-from skv) Message-Id: <200606091623.k59GNqQe046315@freefall.freebsd.org> Date: Fri, 9 Jun 2006 16:23:52 GMT From: skv@FreeBSD.org To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.2 Cc: Subject: conf/98758: Templatize 'jail_fstab' in /etc/rc.d/jail X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: skv@FreeBSD.org List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jun 2006 16:30:08 -0000 >Number: 98758 >Category: conf >Synopsis: Templatize 'jail_fstab' in /etc/rc.d/jail >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 09 16:30:07 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Sergey Skvortsov >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: >Description: Allow define template for jail's fstab. >How-To-Repeat: /etc/rc.conf.d/jail: jail_fstab="/etc/fstab.jail" # TEMPLATE jail_list="host1 host2" jail_host1_rootdir="/data/jails/host1" jail_host2_rootdir="/data/jails/host2" /etc/fstab.jail: # Device Mountpoint FStype Options Dump Pass# /usr/ports %%JAIL_ROOT%%/usr/ports nullfs rw 0 0 Mounts will be maded accordingly to the template: /usr/ports on /data/jails/host1/usr/ports (nullfs, local) /usr/ports on /data/jails/host2/usr/ports (nullfs, local) >Fix: --- jail.orig Fri Jun 9 20:04:50 2006 +++ jail Fri Jun 9 20:08:22 2006 @@ -150,7 +150,8 @@ fi if checkyesno _mount; then [ -f "${_fstab}" ] || warn "${_fstab} does not exist" - umount -a -F "${_fstab}" >/dev/null 2>&1 + sed -e "s=%%JAIL_ROOT%%=${_rootdir}=" "${_fstab}" | \ + umount -a -F /dev/fd/0 >/dev/null 2>&1 fi } @@ -183,7 +184,8 @@ if [ ! -f "${_fstab}" ]; then err 3 "$name: ${_fstab} does not exist" fi - mount -a -F "${_fstab}" + sed -e "s=%%JAIL_ROOT%%=${_rootdir}=" "${_fstab}" | \ + mount -a -F /dev/fd/0 fi if checkyesno _devfs; then # If devfs is already mounted here, skip it. >Release-Note: >Audit-Trail: >Unformatted: