svn commit: r253919 - head/release/ia64

[Marcel Moolenaar]

Author: marcel
Date: Sat Aug  3 20:14:29 2013
New Revision: 253919
URL: http://svnweb.freebsd.org/changeset/base/253919

Log:
  Fix the bootable CD:
  o   We need wait a bit before attempting the root mount. The CD drives
      on HP machines (typical) go through the management controller so
      that it can be virtualized. In practice what this means is that it
      is slow to detect and attach.
  o   Tell the kernel what to use as the root file system. The /etc/fstab
      trick doesn't work, because we're on the EFI-compatble file system.

Modified:
  head/release/ia64/mkisoimages.sh

Modified: head/release/ia64/mkisoimages.sh
==============================================================================
--- head/release/ia64/mkisoimages.sh	Sat Aug  3 18:05:12 2013	(r253918)
+++ head/release/ia64/mkisoimages.sh	Sat Aug  3 20:14:29 2013	(r253919)
@@ -68,6 +68,8 @@ if [ $bootable = yes ]; then
     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"