From owner-freebsd-bugs@FreeBSD.ORG Mon Feb 26 13:20:07 2007 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 74EE316A400 for ; Mon, 26 Feb 2007 13:20:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 4BCBC13C491 for ; Mon, 26 Feb 2007 13:20:07 +0000 (UTC) (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 l1QDK7G8016386 for ; Mon, 26 Feb 2007 13:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1QDK7LF016385; Mon, 26 Feb 2007 13:20:07 GMT (envelope-from gnats) Resent-Date: Mon, 26 Feb 2007 13:20:07 GMT Resent-Message-Id: <200702261320.l1QDK7LF016385@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, Jeremie Le Hen Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8FF7D16A400 for ; Mon, 26 Feb 2007 13:19:18 +0000 (UTC) (envelope-from tataz@tataz.chchile.org) Received: from postfix1-g20.free.fr (postfix1-g20.free.fr [212.27.60.42]) by mx1.freebsd.org (Postfix) with ESMTP id 3120D13C47E for ; Mon, 26 Feb 2007 13:19:18 +0000 (UTC) (envelope-from tataz@tataz.chchile.org) Received: from smtp5-g19.free.fr (smtp5-g19.free.fr [212.27.42.35]) by postfix1-g20.free.fr (Postfix) with ESMTP id 1293FA9AE5B for ; Mon, 26 Feb 2007 13:56:43 +0100 (CET) Received: from tatooine.tataz.chchile.org (tataz.chchile.org [82.233.239.98]) by smtp5-g19.free.fr (Postfix) with ESMTP id 54B8235BCE for ; Mon, 26 Feb 2007 13:56:42 +0100 (CET) Received: from obiwan.tataz.chchile.org (unknown [192.168.1.25]) by tatooine.tataz.chchile.org (Postfix) with ESMTP id 86D469BF12 for ; Mon, 26 Feb 2007 12:58:33 +0000 (UTC) Received: by obiwan.tataz.chchile.org (Postfix, from userid 1000) id 787CC405B; Mon, 26 Feb 2007 13:58:33 +0100 (CET) Message-Id: <20070226125833.787CC405B@obiwan.tataz.chchile.org> Date: Mon, 26 Feb 2007 13:58:33 +0100 (CET) From: Jeremie Le Hen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: conf/109562: [rc.d] [patch] Make rc.d/devfs usable from command-line X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jeremie Le Hen List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 13:20:07 -0000 >Number: 109562 >Category: conf >Synopsis: [rc.d] [patch] Make rc.d/devfs usable from command-line >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 26 13:20:06 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Jeremie Le Hen >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: FreeBSD jarjarbinks 7.0-CURRENT FreeBSD 7.0-CURRENT #23: Sun Feb 25 20:01:52 UTC 2007 root@jarjarbinks/usr/obj/usr/src/sys/JARJARBINKS i386 >Description: The attached patch allows to provide arguments to rc.d/devfs with the same syntax as $devfs_set_rulesets. This is then easier to mount manually devfs inside a directory and apply some predefined rulesets on it. Before this patch you had to manually apply rules to the devfs mount point, provided pre-configured rulesets had been loaded into the kernel (with rc.subr's devfs_init_rulesets()). Example: % mount_devfs none /space/chroot/dev % /etc/rc.d/devfs start /space/chroot/dev=devfsrules_jail >How-To-Repeat: >Fix: --- rc.d_devfs.patch begins here --- Index: devfs =================================================================== RCS file: /home/ncvs/src/etc/rc.d/devfs,v retrieving revision 1.12 diff -u -p -r1.12 devfs --- devfs 21 Jan 2006 14:31:45 -0000 1.12 +++ devfs 22 Feb 2007 08:04:16 -0000 @@ -14,8 +14,27 @@ name="devfs" start_cmd='devfs_start' stop_cmd=':' +set_rulesets() +{ + local _dir_set + local _dir + local _set + for _dir_set in "$@"; do + _dir=${_dir_set%=*} + _set=${_dir_set#*=} + devfs_set_ruleset $_set $_dir + devfs_apply_ruleset $_set $_dir + done +} + devfs_start() { + if [ $# -gt 0 ]; then + devfs_init_rulesets + set_rulesets "$@" + return + fi + if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ]; then devfs_init_rulesets if [ -n "$devfs_system_ruleset" ]; then @@ -23,15 +42,7 @@ devfs_start() devfs_apply_ruleset $devfs_system_ruleset /dev fi if [ -n "$devfs_set_rulesets" ]; then - local _dir_set - local _dir - local _set - for _dir_set in $devfs_set_rulesets; do - _dir=${_dir_set%=*} - _set=${_dir_set#*=} - devfs_set_ruleset $_set $_dir - devfs_apply_ruleset $_set $_dir - done + set_rulesets "$devfs_set_rulesets" fi fi read_devfs_conf @@ -67,4 +78,4 @@ read_devfs_conf() } load_rc_config $name -run_rc_command "$1" +run_rc_command "$@" --- rc.d_devfs.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: