From yzlin@cs.nctu.edu.tw  Mon Jul 21 14:45:34 2008
Return-Path: <yzlin@cs.nctu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 65A7A106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Jul 2008 14:45:34 +0000 (UTC)
	(envelope-from yzlin@cs.nctu.edu.tw)
Received: from csmailgate.cs.nctu.edu.tw (csmailgate.cs.nctu.edu.tw [140.113.235.103])
	by mx1.freebsd.org (Postfix) with ESMTP id 22B5F8FC22
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Jul 2008 14:45:33 +0000 (UTC)
	(envelope-from yzlin@cs.nctu.edu.tw)
Received: from stucgi.cs.nctu.edu.tw (stucgi [140.113.235.130])
	by csmailgate.cs.nctu.edu.tw (Postfix) with ESMTP id 9320E12B072;
	Mon, 21 Jul 2008 22:45:32 +0800 (CST)
Received: (from yzlin@localhost)
	by stucgi.cs.nctu.edu.tw (8.14.2/8.14.2/Submit) id m6LEc05d004983;
	Mon, 21 Jul 2008 22:38:00 +0800 (CST)
	(envelope-from yzlin)
Message-Id: <200807211438.m6LEc05d004983@stucgi.cs.nctu.edu.tw>
Date: Mon, 21 Jul 2008 22:38:00 +0800 (CST)
From: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mark@foster.cc
Subject: [PATCH] net/iscsi-target: make rc script to support iscsi_target_flags
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mark@foster.cc

>Number:         125833
>Category:       ports
>Synopsis:       [PATCH] net/iscsi-target: make rc script to support iscsi_target_flags
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 21 14:50:03 UTC 2008
>Closed-Date:    Tue Jul 22 14:45:00 UTC 2008
>Last-Modified:  Tue Jul 22 14:45:00 UTC 2008
>Originator:     Yi-Jheng Lin
>Release:        FreeBSD 7.0-RELEASE-p1 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Thu Apr 17 15:56:39 CST 2008
>Description:
iscsi-target support many arguments such as "-t" for iscsi target name, but we
couldn't just set variable like setting iscsi_target_flags="-t xxx" in /etc/rc.conf
to customize it.

The following patches add this support and fix warnings by portlint.

Port maintainer (mark@foster.cc) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- iscsi-target-20080207_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/iscsi-target/Makefile /amd/account/gcs/96/9655630/dev/ports/net/iscsi-target/Makefile
--- /usr/ports/net/iscsi-target/Makefile	2008-05-03 21:39:28.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/net/iscsi-target/Makefile	2008-07-21 22:29:12.000000000 +0800
@@ -11,7 +11,7 @@
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ \
 		http://www.magnesium.net/~mdf/distfiles/
-PKGNAMESUFFIX=  -target
+PKGNAMESUFFIX=	-target
 DISTNAME=	netbsd-iscsi-${PORTVERSION}
 
 MAINTAINER=	mark@foster.cc
@@ -53,6 +53,6 @@
 		${CP} -p ${PREFIX}/etc/iscsi/$i.sample ${PREFIX}/etc/iscsi/$i ; \
 	fi
 .endfor
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
-	@${CAT} ${PKGMESSAGE}
diff -ruN --exclude=CVS /usr/ports/net/iscsi-target/files/iscsi_target.in /amd/account/gcs/96/9655630/dev/ports/net/iscsi-target/files/iscsi_target.in
--- /usr/ports/net/iscsi-target/files/iscsi_target.in	2006-10-07 23:25:26.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/net/iscsi-target/files/iscsi_target.in	2008-07-21 22:17:34.000000000 +0800
@@ -8,15 +8,15 @@
 name="iscsi_target"
 rcvar=`set_rcvar`
 
-command="%%PREFIX%%/bin/iscsi-target"
-required_files="%%PREFIX%%/etc/iscsi/targets"
-pidfile="/var/run/iscsi-target.pid"
-
 load_rc_config $name
 
 : ${iscsi_target_enable="NO"}
 : ${iscsi_target_config="%%PREFIX%%/etc/iscsi/targets"}
+: ${iscsi_target_flags=""}
 
-command_args="-f $iscsi_target_config"
+command="%%PREFIX%%/bin/iscsi-target"
+command_args="-f ${iscsi_target_config} ${iscsi_target_flags}"
+required_files="${iscsi_target_config}"
+pidfile="/var/run/iscsi-target.pid"
 
 run_rc_command "$1"
--- iscsi-target-20080207_2.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jul 21 14:50:19 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125833 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: mark@foster.cc
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/125833: [PATCH] net/iscsi-target: make rc script to support iscsi_target_flags
Date: Mon, 21 Jul 2008 14:50:16 UT

 Maintainer of net/iscsi-target,
 
 Please note that PR ports/125833 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/125833
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Mark Foster <mark@foster.cc>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125833: [PATCH] net/iscsi-target: make rc script to support
 iscsi_target_flags
Date: Mon, 21 Jul 2008 09:33:01 -0700

 Approved.
 
 -- 
 Some days it's just not worth chewing through the restraints...
 Mark D. Foster, CISSP <mark@foster.cc>  http://mark.foster.cc/
 
 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Mon Jul 21 17:02:35 UTC 2008 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125833 
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Mon Jul 21 18:57:24 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125833 

From: Wesley Shields <wxs@FreeBSD.org>
To: mark@foster.cc, bug-followup@FreeBSD.org
Cc: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
Subject: Re: ports/125833: [PATCH] net/iscsi-target: make rc script to
	support iscsi_target_flags
Date: Mon, 21 Jul 2008 21:47:42 -0400

 Are you sure this is necessary?  This is from the net/iscsi-target port
 installed without any updates from this PR applied (sorry if anything
 wraps).
 
 wxs@ack ~ % grep iscsi_target /etc/rc.conf
 iscsi_target_enable="YES"
 iscsi_target_flags="-p 54321"
 wxs@ack ~ % sudo /usr/local/etc/rc.d/iscsi_target restart
 iscsi_target not running? (check /var/run/iscsi-target.pid).
 Starting iscsi_target.
 Reading configuration from `/usr/local/etc/iscsi/targets'
 target0:rw:10.4.0.0/16
         extent0:/tmp/iscsi-target0:0:104857600
 DISK: 1 logical unit (204800 blocks, 512 bytes/block), type iscsi fs
 DISK: LUN 0: 100 MB disk storage for "target0"
 TARGET: TargetName is iqn.1994-04.org.netbsd.iscsi-target
 wxs@ack ~ % sockstat -4p 54321
 USER     COMMAND    PID   FD PROTO  LOCAL ADDRESS         FOREIGN ADDRESS
 root     iscsi-targ 86579 5  tcp4   *:54321               *:*
 wxs@ack ~ % ps -auxwww | grep iscsi
 root  86579  0.0  0.1  6816  1360  ??  Is    9:39PM   0:00.00
 /usr/local/bin/iscsi-target -p 54321 -f /usr/local/etc/iscsi/targets
 wxs   93739  0.0  0.1  7956  1320  p1  R+    9:44PM   0:00.00 grep iscsi
 wxs@ack ~ %
 
 I suspect this patch is unnecessary.  Do either of you have any more
 information that contradicts this?
 
 -- WXS
State-Changed-From-To: open->feedback 
State-Changed-By: wxs 
State-Changed-When: Tue Jul 22 02:21:08 UTC 2008 
State-Changed-Why:  
Awaiting feedback. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125833 

From: Mark Foster <mark@foster.cc>
To: Wesley Shields <wxs@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
Subject: Re: ports/125833: [PATCH] net/iscsi-target: make rc script to	support
 iscsi_target_flags
Date: Mon, 21 Jul 2008 21:07:29 -0700

 Wesley Shields wrote:
 > Are you sure this is necessary?  This is from the net/iscsi-target port
 > installed without any updates from this PR applied (sorry if anything
 > wraps).
 > ...
 >
 > I suspect this patch is unnecessary.  Do either of you have any more
 > information that contradicts this?
 >
 > -- WXS
 >   
 I concur, the functionality for  the global ${name}_flags appears to be 
 in /etc/rc.subr
 
 -- 
 Some days it's just not worth chewing through the restraints...
 Mark D. Foster, CISSP <mark@foster.cc>  http://mark.foster.cc/
 
 

From: =?utf-8?B?5p6X5a6c5pS/?= Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
To: Wesley Shields <wxs@FreeBSD.org>
Cc: mark@foster.cc, bug-followup@FreeBSD.org,
        Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
Subject: Re: ports/125833: [PATCH] net/iscsi-target: make rc script to
	support iscsi_target_flags
Date: Tue, 22 Jul 2008 12:22:40 +0800

 --Kj7319i9nmIyA2yE
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 It's my mistake. I didn't notice that ${name}_flags will be detected in /et=
 c/rc.subr.
 I agree this patch is unnecessary.
 
 On Mon, Jul 21, 2008 at 09:47:42PM -0400, Wesley Shields wrote:
 > Are you sure this is necessary?  This is from the net/iscsi-target port
 > installed without any updates from this PR applied (sorry if anything
 > wraps).
 >=20
 > wxs@ack ~ % grep iscsi_target /etc/rc.conf
 > iscsi_target_enable=3D"YES"
 > iscsi_target_flags=3D"-p 54321"
 > wxs@ack ~ % sudo /usr/local/etc/rc.d/iscsi_target restart
 > iscsi_target not running? (check /var/run/iscsi-target.pid).
 > Starting iscsi_target.
 > Reading configuration from `/usr/local/etc/iscsi/targets'
 > target0:rw:10.4.0.0/16
 >         extent0:/tmp/iscsi-target0:0:104857600
 > DISK: 1 logical unit (204800 blocks, 512 bytes/block), type iscsi fs
 > DISK: LUN 0: 100 MB disk storage for "target0"
 > TARGET: TargetName is iqn.1994-04.org.netbsd.iscsi-target
 > wxs@ack ~ % sockstat -4p 54321
 > USER     COMMAND    PID   FD PROTO  LOCAL ADDRESS         FOREIGN ADDRESS
 > root     iscsi-targ 86579 5  tcp4   *:54321               *:*
 > wxs@ack ~ % ps -auxwww | grep iscsi
 > root  86579  0.0  0.1  6816  1360  ??  Is    9:39PM   0:00.00
 > /usr/local/bin/iscsi-target -p 54321 -f /usr/local/etc/iscsi/targets
 > wxs   93739  0.0  0.1  7956  1320  p1  R+    9:44PM   0:00.00 grep iscsi
 > wxs@ack ~ %
 >=20
 > I suspect this patch is unnecessary.  Do either of you have any more
 > information that contradicts this?
 >=20
 > -- WXS
 
 --Kj7319i9nmIyA2yE
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (FreeBSD)
 
 iEYEARECAAYFAkiFYJAACgkQBPkQzQ9N7oVU1gCfXogAjxY2r6B4STEH5baDyJ5p
 bBsAoIDF/IfZcgSfv/BPhq0inNas1EaO
 =LTPv
 -----END PGP SIGNATURE-----
 
 --Kj7319i9nmIyA2yE--
State-Changed-From-To: feedback->closed 
State-Changed-By: wxs 
State-Changed-When: Tue Jul 22 14:44:58 UTC 2008 
State-Changed-Why:  
Closed at maintainers and submitters request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125833 
>Unformatted:
