Add EC2PUBLICSNAP option to EC2 builds; this passes a (recently added)

flag to bsdec2-image-upload instructing it to mark the snapshot of its
root disk as public (which is independent from marking the created AMIs
as public).

Requested by:	Amazon
This commit is contained in:
Colin Percival 2018-08-06 19:21:32 +00:00
parent 564ec04ea8
commit a7ec419d93
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=337394

View file

@ -35,6 +35,9 @@ AMINAMESUFFIX!= date +-%Y-%m-%d
.if defined(EC2PUBLIC) && !empty(EC2PUBLIC)
PUBLISH= --public
.endif
.if defined(EC2PUBLICSNAP) && !empty(EC2PUBLICSNAP)
PUBLISH= --publicsnap
.endif
.if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
EC2SNSREL= ${REVISION}-${BRANCH}
EC2SNSVERS= ${EC2_SVNBRANCH}@${EC2_SVNREV}
@ -79,7 +82,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
@echo "--------------------------------------------------------------"
@false
.endif
/usr/local/bin/bsdec2-image-upload ${PUBLISH} --sriov --ena \
/usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} --sriov --ena \
${.OBJDIR}/ec2.raw \
"${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
"${TYPE}/${TARGET} ${EC2_SVNBRANCH}@${EC2_SVNREV}" \