Index: stable/11/sys/boot/powerpc/boot1.chrp/Makefile.hfs
===================================================================
--- stable/11/sys/boot/powerpc/boot1.chrp/Makefile.hfs	(revision 305900)
+++ stable/11/sys/boot/powerpc/boot1.chrp/Makefile.hfs	(revision 305901)
@@ -1,4 +1,4 @@
 # This file autogenerated by generate-hfs.sh - DO NOT EDIT
 # $FreeBSD$
-BOOTINFO_OFFSET=0x58
+BOOTINFO_OFFSET=0x9c
 BOOT1_OFFSET=0x1c
Index: stable/11/sys/boot/powerpc/boot1.chrp/generate-hfs.sh
===================================================================
--- stable/11/sys/boot/powerpc/boot1.chrp/generate-hfs.sh	(revision 305900)
+++ stable/11/sys/boot/powerpc/boot1.chrp/generate-hfs.sh	(revision 305901)
@@ -1,64 +1,64 @@
 #!/bin/sh
 
 # This script generates the dummy HFS filesystem used for the PowerPC boot
 # blocks. It uses hfsutils (emulators/hfsutils) to generate a template
 # filesystem with the relevant interesting files. These are then found by
 # grep, and the offsets written to a Makefile snippet.
 #
 # Because of licensing concerns, and because it is overkill, we do not
 # distribute hfsutils as a build tool. If you need to regenerate the HFS
 # template (e.g. because the boot block or the CHRP script have grown),
 # you must install it from ports.
 
 # $FreeBSD$
 
 HFS_SIZE=1600 			#Size in 512-byte blocks of the produced image
 
 CHRPBOOT_SIZE=2k
-BOOT1_SIZE=30k
+BOOT1_SIZE=64k
 
 # Generate 800K HFS image
 OUTPUT_FILE=hfs.tmpl
 
 dd if=/dev/zero of=$OUTPUT_FILE bs=512 count=$HFS_SIZE
 hformat -l "FreeBSD Bootstrap" $OUTPUT_FILE
 hmount $OUTPUT_FILE
 
 # Create and bless a directory for the boot loader
 hmkdir ppc
 hattrib -b ppc
 hcd ppc
 
 # Make two dummy files for the CHRP boot script and boot1
 echo 'Bootinfo START' | dd of=bootinfo.txt.tmp cbs=$CHRPBOOT_SIZE count=1 conv=block
 echo 'Boot1 START' | dd of=boot1.elf.tmp cbs=$BOOT1_SIZE count=1 conv=block
 
 hcopy boot1.elf.tmp :boot1.elf
 hcopy bootinfo.txt.tmp :bootinfo.txt
 hattrib -c chrp -t tbxi bootinfo.txt
 humount
 
 rm bootinfo.txt.tmp
 rm boot1.elf.tmp
 
 # Locate the offsets of the two fake files
 BOOTINFO_OFFSET=$(hd $OUTPUT_FILE | grep 'Bootinfo START' | cut -f 1 -d ' ')
 BOOT1_OFFSET=$(hd $OUTPUT_FILE | grep 'Boot1 START' | cut -f 1 -d ' ')
 
 # Convert to numbers of blocks
 BOOTINFO_OFFSET=$(echo 0x$BOOTINFO_OFFSET | awk '{printf("%x\n",$1/512);}')
 BOOT1_OFFSET=$(echo 0x$BOOT1_OFFSET | awk '{printf("%x\n",$1/512);}')
 
 echo '# This file autogenerated by generate-hfs.sh - DO NOT EDIT' > Makefile.hfs
 echo '# $FreeBSD$' >> Makefile.hfs
 echo "BOOTINFO_OFFSET=0x$BOOTINFO_OFFSET" >> Makefile.hfs
 echo "BOOT1_OFFSET=0x$BOOT1_OFFSET" >> Makefile.hfs
 
 bzip2 $OUTPUT_FILE
 echo 'HFS template boot filesystem created by generate-hfs.sh' > $OUTPUT_FILE.bz2.uu
 echo 'DO NOT EDIT' >> $OUTPUT_FILE.bz2.uu
 echo '$FreeBSD$' >> $OUTPUT_FILE.bz2.uu
 
 uuencode $OUTPUT_FILE.bz2 $OUTPUT_FILE.bz2 >> $OUTPUT_FILE.bz2.uu
 rm $OUTPUT_FILE.bz2
 
Index: stable/11/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
===================================================================
--- stable/11/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu	(revision 305900)
+++ stable/11/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu	(revision 305901)
@@ -1,18 +1,18 @@
 HFS template boot filesystem created by generate-hfs.sh
 DO NOT EDIT
 $FreeBSD$
 begin 644 hfs.tmpl.bz2
-M0EIH.3%!62936?(HJX\``"]_]?___O)20>!4M2$>0#MUW$1$``$!$``"2!`(
-M4EG``>G*VV3"22334_2(/*>ID,@``:#U&"-#(!IZ0`)$HIY0>B-#(/4T```&
-M@R:`&@``<:,F1A&(!A-!@$T&@9,FC)D,(#!4E-*--31ZAB!DT!ID:#$81HT&
-M@9-!Z::C:E=SZCC1((92M^1Q@3&>="[<2FD((A[AT#`[('#?MSV(S,><P)B_
-M'31",-UG78$CN,$&,P3:!)"2/J]\T9KP63TV)"&Y8"1B*E$I(H935A3LKL9M
-M74FBH6E17;ETD`2U#;5%_9P+&>HOI'#2,"EJ0PU5)<J26E2$`KSGEA(F9(P%
-M4&+M\K54E21K+%@1UU%`;'(KZQS5)SNB[)4WUZY`"6K8U]=8Z-W*[M[UXWZ.
-M`DAMLBTF-IC8Z77:KA%),$[3LHK,^`EA`+E,(2&TIFEA-;:US^NQ)+<8%WIC
-M59:&JR9^`#&G)-N@DK.0#ZQ_>.T`PX,54O,RTW8-",N1`R>?SL"+?Q51[H]#
-MJ1C5"]BDBF1UJ!Y`J$WTC]QAFZ%Q21$J,I&0,0?9?DPU!Z>$9.380JJCO$Q8
-MXZTX)GQCCGNC%G1BIDBHTK#J9N0,M[85QC:.'>]#,GPRAALU*=)2`$ND22<.
--VK/^+N2*<*$AY%%7'@``
+M0EIH.3%!629365^MV6L``"]__O___M)20>!0O2$>0#MUW$!$``%%$``@``!`
+M!`!R2<`![@H2"2A2-Z)-HC]4`:`-``T:&@&@#0/TTH<`PC":8A@$`R`&$:9,
+MF$8"&AP#",)IB&`0#(`81IDR81@(:")0HT*>4,:0TT`:!ZC0/*/4/1&@;4>H
+M&@RYG-FL-,\=C91FTSS@99`O+OA;*$ZN3-&UF`W@#SP:;MVF_EN,-]P$ZN2B
+M=";7YHA7VT!#<@,B`H*?S#?Q;CUJ8H8+9:E)+4"L7'CL5&D.IO4;H98%^4@[
+M9`*L&1``5*0#A(E<M\J&(@6BZXC<0K!#!)!H05`5*L!^DNM12_"L`<9!Y.7T
+M<I94[[MT$^$30P-DYBVI.X7R<KY7&H$DA(<S;NW1PB7-47*Q>B8BH`S'1O^N
+M)Y6'!#N:*:<E!+,#/,\;M_FXRP![+P44D6],L'G1X7Q&[JI6WN@&KCIW8:".
+MTP=Y77`%67""`=I/UR500#!=DD+!>JYTEX\:%'"?.G$FCP8TM_0/ND`^IG3[
+M.QUEDP&P>3+Z442Q!:S.A1>00]'X'D%)UX9QZ>$Q?(808QB-4%9BBTL"L(BB
+MEJ*'HH820Q$'%G':JF.:>$U4H`0S`:GSZM-C5BNX(2&$B"J*45`"4FEZ__%W
+))%.%"07ZW9:P
 `
 end
Index: stable/11
===================================================================
--- stable/11	(revision 305900)
+++ stable/11	(revision 305901)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r305894