From owner-svn-src-stable@freebsd.org  Sat Dec  5 22:51:21 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 64BF1A4234E;
 Sat,  5 Dec 2015 22:51:21 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 31C6B12A3;
 Sat,  5 Dec 2015 22:51:21 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB5MpKg5035251;
 Sat, 5 Dec 2015 22:51:20 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB5MpKSd035250;
 Sat, 5 Dec 2015 22:51:20 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512052251.tB5MpKSd035250@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 5 Dec 2015 22:51:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r291874 - stable/10/rescue/rescue
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Dec 2015 22:51:21 -0000

Author: ngie
Date: Sat Dec  5 22:51:20 2015
New Revision: 291874
URL: https://svnweb.freebsd.org/changeset/base/291874

Log:
  MFC r289452,r289469:
  
  r289452 (by trasz):
  
  Add iscsictl(8) and iscsid(8) to rescue(8).  The point is to make it
  easier to build md_root images from rescue(8), to use with iSCSI boot.
  
  The change increases the size of rescue by 62kB, from 8728kB to 8790kB.
  
  Reviewed by:	bapt@
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D3865
  
  r289469:
  
  Make iscsictl and iscsid build if MK_ISCSI == yes

Modified:
  stable/10/rescue/rescue/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/rescue/rescue/Makefile
==============================================================================
--- stable/10/rescue/rescue/Makefile	Sat Dec  5 22:44:07 2015	(r291873)
+++ stable/10/rescue/rescue/Makefile	Sat Dec  5 22:51:20 2015	(r291874)
@@ -224,5 +224,10 @@ CRUNCH_ALIAS_chown= chgrp
 ##################################################################
 CRUNCH_LIBS+= -lm
 
+.if ${MK_ISCSI} != "no"
+CRUNCH_PROGS_usr.bin+=	iscsictl
+CRUNCH_PROGS_usr.sbin+=	iscsid
+.endif
+
 .include <bsd.crunchgen.mk>
 .include <bsd.prog.mk>