From owner-svn-ports-head@FreeBSD.ORG  Sun Dec  8 05:46:31 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E62D8C84;
 Sun,  8 Dec 2013 05:46:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B958313BF;
 Sun,  8 Dec 2013 05:46:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB85kVi3013587;
 Sun, 8 Dec 2013 05:46:31 GMT (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB85kV6A013585;
 Sun, 8 Dec 2013 05:46:31 GMT (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201312080546.rB85kV6A013585@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sun, 8 Dec 2013 05:46:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335865 - head/sysutils/ec2-scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Dec 2013 05:46:32 -0000

Author: cperciva
Date: Sun Dec  8 05:46:31 2013
New Revision: 335865
URL: http://svnweb.freebsd.org/changeset/ports/335865

Log:
  Update ec2-scripts to 1.7:
  * Add support for system configuration via ec2 user-data.
  * Add support for allocating swap space from ephemeral disks with EC2
    (linux) device names of "xvd[a-j]" rather than just "sd[a-j]".

Modified:
  head/sysutils/ec2-scripts/Makefile
  head/sysutils/ec2-scripts/distinfo

Modified: head/sysutils/ec2-scripts/Makefile
==============================================================================
--- head/sysutils/ec2-scripts/Makefile	Sun Dec  8 05:34:43 2013	(r335864)
+++ head/sysutils/ec2-scripts/Makefile	Sun Dec  8 05:46:31 2013	(r335865)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ec2-scripts
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://freebsd-ec2-dist.s3.amazonaws.com/
 EXTRACT_SUFX=	.tgz
@@ -16,7 +16,6 @@ OPTIONS_DEFINE=	NOFIRSTBOOT
 NOFIRSTBOOT_DESC=	Use old (pre-firstboot support) version of scripts
 
 NO_BUILD=	YES
-NO_INSTALL=	YES
 
 RC_SCRIPTS=	ec2_bootmail ec2_ephemeralswap ec2_fetchkey ec2_loghostkey
 
@@ -25,13 +24,22 @@ RC_SCRIPTS=	ec2_bootmail ec2_ephemeralsw
 .if ${PORT_OPTIONS:MNOFIRSTBOOT}
 PORTVERSION=	1.5
 PORTREVISION=	1
+NO_INSTALL=	YES
 RC_SCRIPTS+=	ec2_firstboot panicmail
+.else
+RC_SCRIPTS+=	ec2_configinit
+PLIST_FILES=	sbin/configinit
 .endif
 
 .for i in ${RC_SCRIPTS}
 PLIST_FILES+=	etc/rc.d/$i
 .endfor
 
+.if ! ${PORT_OPTIONS:MNOFIRSTBOOT}
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/configinit.sh ${STAGEDIR}${PREFIX}/sbin/configinit
+.endif
+
 post-install:
 .for i in ${RC_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/etc/rc.d/

Modified: head/sysutils/ec2-scripts/distinfo
==============================================================================
--- head/sysutils/ec2-scripts/distinfo	Sun Dec  8 05:34:43 2013	(r335864)
+++ head/sysutils/ec2-scripts/distinfo	Sun Dec  8 05:46:31 2013	(r335865)
@@ -1,4 +1,4 @@
 SHA256 (ec2-scripts-1.5.tgz) = b1c95ecf56d3bcd1e903714cd453666b3fba842ee9ad9a82da519f2b01f00934
 SIZE (ec2-scripts-1.5.tgz) = 4383
-SHA256 (ec2-scripts-1.6.tgz) = 9ebe30cfcd47d2de1205355eb1f64ce424e87ef252ad9c0ccb566415bda33c52
-SIZE (ec2-scripts-1.6.tgz) = 3751
+SHA256 (ec2-scripts-1.7.tgz) = d09f59f8726f98663ccc1e6247fa4737621dab226b46b4cbadec8fac5c75dea2
+SIZE (ec2-scripts-1.7.tgz) = 4587