svn commit: r273204 - head/release

[Glen Barber]

Author: gjb
Date: Fri Oct 17 03:55:33 2014
New Revision: 273204
URL: https://svnweb.freebsd.org/changeset/base/273204

Log:
  Add more descriptive metadata to the ISO images.
  
  PR: 		146079
  Submitted by: 	Roman Bogorodskiy
  MFC after: 	3 days
  X-MFC-10.1: 	yes
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Fri Oct 17 03:04:38 2014	(r273203)
+++ head/release/Makefile	Fri Oct 17 03:55:33 2014	(r273204)
@@ -62,6 +62,8 @@ OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}
 .endfor
 .endif
 
+VOLUME_LABEL=	${OSRELEASE:C/[-\.]/_/g:S/^$${TYPE}_//}
+
 .if !exists(${DOCDIR})
 NODOC= true
 .endif
@@ -247,13 +249,13 @@ dvd:
 
 release.iso: disc1.iso
 disc1.iso: system
-	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ${.TARGET} release
 
 dvd1.iso: dvd pkg-stage
-	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} dvd
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ${.TARGET} dvd
 
 bootonly.iso: bootonly
-	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ${.TARGET} bootonly
 
 memstick: memstick.img
 memstick.img: system