From owner-svn-src-all@FreeBSD.ORG  Fri Aug  9 05:27:39 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2361F92;
 Fri,  9 Aug 2013 05:27:39 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
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 110192DF4;
 Fri,  9 Aug 2013 05:27:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r795RcLq063509;
 Fri, 9 Aug 2013 05:27:38 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r795Rc3w063508;
 Fri, 9 Aug 2013 05:27:38 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201308090527.r795Rc3w063508@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 9 Aug 2013 05:27:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r254124 - releng/9.2/release/ia64
X-SVN-Group: releng
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, 09 Aug 2013 05:27:39 -0000

Author: marcel
Date: Fri Aug  9 05:27:38 2013
New Revision: 254124
URL: http://svnweb.freebsd.org/changeset/base/254124

Log:
  Merge r254075 from stable/9. This fixes the ISO images.
  
  Approved by:	re (gjb@)

Modified:
  releng/9.2/release/ia64/mkisoimages.sh
Directory Properties:
  releng/9.2/release/   (props changed)
  releng/9.2/release/ia64/   (props changed)

Modified: releng/9.2/release/ia64/mkisoimages.sh
==============================================================================
--- releng/9.2/release/ia64/mkisoimages.sh	Fri Aug  9 03:29:46 2013	(r254123)
+++ releng/9.2/release/ia64/mkisoimages.sh	Fri Aug  9 05:27:38 2013	(r254124)
@@ -63,10 +63,13 @@ if [ $bootable = yes ]; then
     if [ -s $BASE/boot/mfsroot.gz ]; then
 	cp $BASE/boot/mfsroot.gz $MNT/boot
     fi
+    cp $BASE/boot/color.4th $MNT/boot
     cp $BASE/boot/support.4th $MNT/boot
     cp $BASE/boot/check-password.4th $MNT/boot
     cp $BASE/boot/screen.4th $MNT/boot
     mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
+    echo kern.cam.boot_delay=\"3000\" >> $MNT/boot/loader.conf
+    echo vfs.root.mountfrom=\"cd9660:iso9660/$LABEL\" >> $MNT/boot/loader.conf
     umount $MNT
     mdconfig -d -u $md
     BOOTOPTS="-o bootimage=i386;$EFIPART -o no-emul-boot"