From owner-svn-src-stable-9@FreeBSD.ORG  Wed Aug  7 21:51:20 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@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 43C24EDA;
 Wed,  7 Aug 2013 21:51:20 +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 30FB22CAB;
 Wed,  7 Aug 2013 21:51:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r77LpKnW015751;
 Wed, 7 Aug 2013 21:51:20 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r77LpKOu015750;
 Wed, 7 Aug 2013 21:51:20 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201308072151.r77LpKOu015750@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 7 Aug 2013 21:51:20 +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: r254075 - stable/9/release/ia64
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Aug 2013 21:51:20 -0000

Author: marcel
Date: Wed Aug  7 21:51:19 2013
New Revision: 254075
URL: http://svnweb.freebsd.org/changeset/base/254075

Log:
  MFC r245347: Add color.4th.
  MFC r253919: Fix the bootable CD.

Modified:
  stable/9/release/ia64/mkisoimages.sh
Directory Properties:
  stable/9/release/ia64/   (props changed)

Modified: stable/9/release/ia64/mkisoimages.sh
==============================================================================
--- stable/9/release/ia64/mkisoimages.sh	Wed Aug  7 21:16:14 2013	(r254074)
+++ stable/9/release/ia64/mkisoimages.sh	Wed Aug  7 21:51:19 2013	(r254075)
@@ -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"