svn commit: r254124 - releng/9.2/release/ia64

[Marcel Moolenaar]

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"