From 14851bf99799a166f92014a370cc42ac2742c2d4 Mon Sep 17 00:00:00 2001
From: marcel <marcel@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 9 Aug 2013 05:27:38 +0000
Subject: [PATCH] Merge r254075 from stable/9. This fixes the ISO images.

Approved by:	re (gjb@)


git-svn-id: svn://svn.freebsd.org/base/releng/9.2@254124 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/ia64/mkisoimages.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release/ia64/mkisoimages.sh b/release/ia64/mkisoimages.sh
index 47fcd1eb..20b01539 100644
--- a/release/ia64/mkisoimages.sh
+++ b/release/ia64/mkisoimages.sh
@@ -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"
-- 
2.42.0