svn commit: r335865 - head/sysutils/ec2-scripts

[Colin Percival]

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