From owner-svn-src-all@freebsd.org Mon Aug 24 09:33:13 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72DF99C1FD7; Mon, 24 Aug 2015 09:33:13 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 631BFB97; Mon, 24 Aug 2015 09:33:13 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7O9XDtD031549; Mon, 24 Aug 2015 09:33:13 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7O9XDle031548; Mon, 24 Aug 2015 09:33:13 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201508240933.t7O9XDle031548@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 24 Aug 2015 09:33:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287102 - head/usr.sbin/ctld X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2015 09:33:13 -0000 Author: trasz Date: Mon Aug 24 09:33:12 2015 New Revision: 287102 URL: https://svnweb.freebsd.org/changeset/base/287102 Log: Some random tweaks to ctl.conf(5). MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/ctld/ctl.conf.5 Modified: head/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- head/usr.sbin/ctld/ctl.conf.5 Mon Aug 24 09:30:27 2015 (r287101) +++ head/usr.sbin/ctld/ctl.conf.5 Mon Aug 24 09:33:12 2015 (r287102) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 24, 2015 +.Dd August 24, 2015 .Dt CTL.CONF 5 .Os .Sh NAME @@ -104,11 +104,11 @@ which can then be assigned to any number .It Ic lun Ar name Create a .Sy lun -configuration context, defining a LUN to be exported by some target(s). +configuration context, defining a LUN to be exported by any number of targets. .It Ic target Ar name Create a .Sy target -configuration context, which can contain one or more +configuration context, which can optionally contain one or more .Sy lun contexts. .It Ic timeout Ar seconds @@ -265,9 +265,10 @@ Another predefined .Qq Ar no-authentication , may be used to permit access without authentication. -Note that targets must only use one of -.Sy auth-group , chap , No or Sy chap-mutual ; -it is a configuration error to mix multiple types in one target. +Note that this clause can be overridden using the second argument +to a +.Sy portal-group +clause. .It Ic auth-type Ar type Sets the authentication type. Type can be either @@ -314,20 +315,42 @@ This clause is mutually exclusive with .Sy auth-group ; one cannot use both in a single target. -.It Ic portal-group Ar name Op Ar agname +.Pp +The +.Sy auth-type , +.Sy chap , +.Sy chap-mutual , +.Sy initiator-name , +and +.Sy initiator-portal +clauses in the target context provide an alternative to assigning an +.Sy auth-group +defined separately, useful in the common case of authentication settings +specific to a single target. +.It Ic portal-group Ar name Op Ar ag-name Assign a previously defined portal group to the target. The default portal group is .Qq Ar default , which makes the target available on TCP port 3260 on all configured IPv4 and IPv6 addresses. -Optional second argument specifies auth group name for connections -to this specific portal group. -If second argument is not specified, target auth group is used. +Optional second argument specifies +.Sy auth-group +for connections to this specific portal group. +If second argument is not specified, target +.Sy auth-group +is used. .It Ic port Ar name .It Ic port Ar name/pp .It Ic port Ar name/pp/vp Assign specified CTL port (such as "isp0" or "isp2/1") to the target. -On startup ctld configures LUN mapping and enables all assigned ports. +This is used to export the target through a specific physical - eg Fibre +Channel - port, in addition to portal-groups configured for the target. +Use +.Cm "ctladm portlist" +command to retrieve the list of available ports. +On startup +.Xr ctld 8 +configures LUN mapping and enables all assigned ports. Each port can be assigned to only one target. .It Ic redirect Ar address IPv4 or IPv6 address to redirect initiators to. @@ -342,6 +365,9 @@ by the parent target. Create a .Sy lun configuration context, defining a LUN exported by the parent target. +.Pp +This is an alternative to defining the LUN separately, useful in the common +case of a LUN being exported by a single target. .El .Ss lun Context .Bl -tag -width indent @@ -429,7 +455,7 @@ target iqn.2012-06.com.example:target1 { lun 0 example_1 lun 1 { path /dev/zvol/tank/example_2 - option foo bar + option vendor "FreeBSD" } }