From owner-svn-src-all@FreeBSD.ORG  Fri Jul 19 02:54:23 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DE802FE9;
 Fri, 19 Jul 2013 02:54:23 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D1CD39A8;
 Fri, 19 Jul 2013 02:54:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6J2sNlX076161;
 Fri, 19 Jul 2013 02:54:23 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6J2sNBw076160;
 Fri, 19 Jul 2013 02:54:23 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201307190254.r6J2sNBw076160@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Fri, 19 Jul 2013 02:54:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r253462 - stable/9/release
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jul 2013 02:54:24 -0000

Author: hrs
Date: Fri Jul 19 02:54:23 2013
New Revision: 253462
URL: http://svnweb.freebsd.org/changeset/base/253462

Log:
  Add cdrom.inf into CD/DVD installation media.  sysinstall(8) requires
  this file to recognize the volume number.
  
  Approved by:	re (marius)

Modified:
  stable/9/release/Makefile

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Fri Jul 19 01:04:17 2013	(r253461)
+++ stable/9/release/Makefile	Fri Jul 19 02:54:23 2013	(r253462)
@@ -161,10 +161,18 @@ bootonly: packagesystem
 	echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
 	cp ${.CURDIR}/rc.local bootonly/etc
 
-release.iso: system
+release/cdrom.inf: system
+	echo "CD_VERSION = ${REVISION}-${BRANCH}" > ${.TARGET}
+	echo "CD_VOLUME = 1" >> ${.TARGET}
+
+release.iso: system release/cdrom.inf
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
 
-bootonly.iso: bootonly
+bootonly/cdrom.inf: bootonly
+	echo "CD_VERSION = ${REVISION}-${BRANCH}" > ${.TARGET}
+	echo "CD_VOLUME = 1" >> ${.TARGET}
+
+bootonly.iso: bootonly bootonly/cdrom.inf
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
 
 memstick: system