From owner-svn-src-head@FreeBSD.ORG  Thu May 12 22:31:13 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8102106564A;
	Thu, 12 May 2011 22:31:13 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B782C8FC21;
	Thu, 12 May 2011 22:31:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4CMVDfI052411;
	Thu, 12 May 2011 22:31:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4CMVD3W052409;
	Thu, 12 May 2011 22:31:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105122231.p4CMVD3W052409@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 12 May 2011 22:31:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221825 - head/release/powerpc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 May 2011 22:31:14 -0000

Author: nwhitehorn
Date: Thu May 12 22:31:13 2011
New Revision: 221825
URL: http://svn.freebsd.org/changeset/base/221825

Log:
  Fix pSeries/PAPR boot CD construction after actual testing. It seems that
  IBM SLOF is (a) case-sensitive and (b) accepts only booting files in
  certain subdirectories of the CD.

Modified:
  head/release/powerpc/mkisoimages.sh

Modified: head/release/powerpc/mkisoimages.sh
==============================================================================
--- head/release/powerpc/mkisoimages.sh	Thu May 12 22:21:39 2011	(r221824)
+++ head/release/powerpc/mkisoimages.sh	Thu May 12 22:31:13 2011	(r221825)
@@ -34,17 +34,15 @@ if [ "x$1" = "x-b" ]; then
 	bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
 
 	# pSeries/PAPR boot code
-	mkdir $4/ppc
+	mkdir -p $4/ppc/chrp
+	cp $4/boot/loader $4/ppc/chrp
 	cat > $4/ppc/bootinfo.txt << EOF
-<CHRP-BOOT>
-<DESCRIPTION>FreeBSD/powerpc</DESCRIPTION>
-<OS-NAME>FreeBSD</OS-NAME>
-<BOOT-SCRIPT>
-boot &device;:&partition;,\boot\loader &device;:0
-</BOOT-SCRIPT>
-</CHRP-BOOT>
+<chrp-boot>
+<description>FreeBSD Install</description>
+<os-name>FreeBSD</os-name>
+<boot-script>boot &device;:&partition;,\ppc\chrp\loader</boot-script>
+</chrp-boot>
 EOF
-
 	shift
 else
 	bootable=""