From owner-freebsd-bugs@FreeBSD.ORG Sun Dec 4 01:40:08 2005 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 D91BF16A41F for ; Sun, 4 Dec 2005 01:40:08 +0000 (GMT) (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 990F343D5E for ; Sun, 4 Dec 2005 01:40: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.3/8.13.3) with ESMTP id jB41e7fB031141 for ; Sun, 4 Dec 2005 01:40:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jB41e7mu031140; Sun, 4 Dec 2005 01:40:07 GMT (envelope-from gnats) Resent-Date: Sun, 4 Dec 2005 01:40:07 GMT Resent-Message-Id: <200512040140.jB41e7mu031140@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, crapsh@monkeybrains.net Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4871016A41F for ; Sun, 4 Dec 2005 01:35:50 +0000 (GMT) (envelope-from root@crepe2.monkeybrains.net) Received: from crepe2.monkeybrains.net (crepe2.monkeybrains.net [69.22.154.9]) by mx1.FreeBSD.org (Postfix) with ESMTP id D67C143D53 for ; Sun, 4 Dec 2005 01:35:49 +0000 (GMT) (envelope-from root@crepe2.monkeybrains.net) Received: from crepe2.monkeybrains.net (localhost [127.0.0.1]) by crepe2.monkeybrains.net (8.13.4/8.13.4) with ESMTP id jB40OdCx064315 for ; Sat, 3 Dec 2005 16:24:39 -0800 (PST) (envelope-from root@crepe2.monkeybrains.net) Received: (from root@localhost) by crepe2.monkeybrains.net (8.13.4/8.13.3/Submit) id jB40Odeu064314; Sat, 3 Dec 2005 16:24:39 -0800 (PST) (envelope-from root) Message-Id: <200512040024.jB40Odeu064314@crepe2.monkeybrains.net> Date: Sat, 3 Dec 2005 16:24:39 -0800 (PST) From: crapsh@monkeybrains.net To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: conf/89911: [patch] /etc/rc.d/jail restart ignores command line jail_list X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: crapsh@monkeybrains.net List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2005 01:40:09 -0000 >Number: 89911 >Category: conf >Synopsis: [patch] /etc/rc.d/jail restart ignores command line jail_list >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Dec 04 01:40:07 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Rudy Rucker >Release: FreeBSD 6.0-STABLE amd64 >Organization: MonkeyBrains.net >Environment: System: FreeBSD crepe2.monkeybrains.net 6.0-STABLE FreeBSD 6.0-STABLE #1: Mon Nov 28 15:19:29 PST 2005 root@crepe2.monkeybrains.net:/usr/obj/usr/src/sys/OPTERON amd64 >Description: The following command: /etc/rc.d/jail restart jail_name Restarts all jails configured in /etc/rc.conf. The more desirable result is for the restart command to act like the stop and start commands. These commands will stop and start *individual* jail(s) listed in $*. >How-To-Repeat: /etc/rc.d/jail restart jail_name >Fix: --- jail Tue Oct 25 17:39:39 2005 +++ jail.new Sat Dec 3 16:15:43 2005 @@ -248,4 +248,16 @@ shift fi [ -n "$*" ] && jail_list="$*" + +# restart calls 'stop' and 'start' and loses the jail_list +# stop the jail_list from the command line in a variable and export it. +# Check for it and reset the jail_list +if [ -n "$_jail_restart_list" ]; then + jail_list=$_jail_restart_list +fi +if [ $cmd = 'restart' ] && [ -n $jail_list ]; then + _jail_restart_list=$jail_list; + export _jail_restart_list +fi + run_rc_command "${cmd}" >Release-Note: >Audit-Trail: >Unformatted: