Index: stable/12/release/powerpc/generate-hfs.sh
===================================================================
--- stable/12/release/powerpc/generate-hfs.sh	(revision 349741)
+++ stable/12/release/powerpc/generate-hfs.sh	(revision 349742)
@@ -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=400		#Size in 2048-byte blocks of the produced image
-LOADER_SIZE=300k
+LOADER_SIZE=500k
 
 # Generate 800K HFS image
 OUTPUT_FILE=hfs-boot
 
 dd if=/dev/zero of=$OUTPUT_FILE bs=2048 count=$HFS_SIZE
 hformat -l "FreeBSD Install" $OUTPUT_FILE
 hmount $OUTPUT_FILE
 
 # Create and bless a directory for the boot loader
 hmkdir ppc
 hattrib -b ppc
 hcd ppc
 
 # Make the CHRP boot script, which gets loader from the ISO9660 partition
 cat > bootinfo.txt << EOF
 <CHRP-BOOT>
 <DESCRIPTION>FreeBSD/powerpc bootloader</DESCRIPTION>
 <OS-NAME>FreeBSD</OS-NAME>
 <VERSION> $FreeBSD: head/stand/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
 -31 00:52:31Z nwhitehorn $ </VERSION>
 
 <COMPATIBLE>
 MacRISC MacRISC3 MacRISC4
 </COMPATIBLE>
 <BOOT-SCRIPT>
 " screen" output
 boot &device;:,\ppc\loader &device;:0
 </BOOT-SCRIPT>
 </CHRP-BOOT>
 EOF
 echo 'Loader START' | dd of=loader.tmp cbs=$LOADER_SIZE count=1 conv=block
 
 hcopy bootinfo.txt :bootinfo.txt
 hcopy loader.tmp :loader
 hattrib -c chrp -t tbxi bootinfo.txt
 humount
 
 rm bootinfo.txt
 rm loader.tmp
 
 bzip2 $OUTPUT_FILE
 echo 'HFS 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/12/release/powerpc/hfs-boot.bz2.uu
===================================================================
--- stable/12/release/powerpc/hfs-boot.bz2.uu	(revision 349741)
+++ stable/12/release/powerpc/hfs-boot.bz2.uu	(revision 349742)
@@ -1,23 +1,23 @@
 HFS boot filesystem created by generate-hfs.sh
 DO NOT EDIT
 $FreeBSD$
 begin 644 hfs-boot.bz2
-M0EIH.3%!62936=#$Y.(``"___?_O_G)7!_Y]OW??5#]U_^!`0`,@1`!!``!@
-M(0!`3,`"L"4.2U"2(H9%/:*>TFDVU3RGZID'J&C3U,@T-&@`/1!H>IZC1D#(
-M`D24TTRFC1D]*;$@!IZ@Q!IH-````#0&33":?J@<:&AH:`:`Q`T!D``&F@`:
-M`9````PDI1J>0Q,H/1J&@```!D-`````T-``#SZHHR(+Y*Y9J*Z:4KK=T]W@
-M4RV\LG/;0XDPC7^`9DO3/3&*].462T,NO#AA9C,O\0!)^Q@@S6";2`!);<W\
-MM\)T,GR:I$-V("3$9$B"&8,,*RS@L++(8KPP)-C!L0(22AH:=29JC18OSD@O
-M&&`F8@M#$H:5#;%`Q)(22DF(/IB46IH0H?):$7!BU_SU=DL`+E*J,;0?%AW6
-M#\-_#^NL++6(CI"!)*#8N/S2"7!C_QAB8[(ZW3G$\`G81HL8.H^M8?#(Z"JL
-M;J^PI=+>?8(B6BR1(-7Q*8?>>HPQSBQE>M$A9K6FFW<:#6[D931J%U.F8*`0
-MD(,M80A(0;]K'X'SI]G(C)Y).AK_/0)D(2$$]JB$]]F').M4RF8O%[IHK[0O
-MMQ?'>O[U8EM;>U<P%^7)&#;>",KY^*%FO9C05_435?.4*F[6AIL%&9C<9W&&
-M[ZMP(TG!'*4Z>@6TM)0BS.D._O,WR9OJ728V48I;DD=8QGBE7J-&L^?=0JEF
-MV2`B/)/D\)83IS@32(;!P,152U()0VGQH>2F$UC:M!D5`F#1W$\:KKDR[TQB
-MN;N<J=4-1'[HLG,!L^IJG53+[IORM_L7JB/:/<+:634`XD.R'",=M$A;C4E.
-M$RRHL2;B)D:_ZJVK$Z*40?H'TATSF5$$%L@<LB4`\2$P90.50PWE:'REG6\D
-ML%>5B1;P!7:AG#1BP2%-Q$7I6QE,Y?NHIK_LR+HA]22HW0.8(^G4/X`Z@!Z6
-8#PQ(0))/`A(0.'VUG_\7<D4X4)#0Q.3B
+M0EIH.3%!62936=IZTD$``"__]__O_G)7!_Y]OV??5']UW\1$0`$$0```P&`@
+M`$A`3,`"L#DRUJM"4E,32>D\*>4\HS2-`:`#0````>IH`>H!H-`$B23)H"8%
+M!^DF@!ID`:-!H-``&@]3U-`#0]('``-!H:#0`:9!H9`TT``!D`&0&0`$DDIH
+M-I-`]0#3U-!HT`'J-``````T-`:&(\F**;,&,E=GQ&[8L)7V[YZ^ZJR_.@4&
+MU2XDPC+N!>EYZ/W&3#04SE<:P5525]GTO0!)[3!!B8)L`$@-R?/:TG2RBWBD
+M0W-`28BS(@AF_JA3LX#"=D,6`8$FQH;$D(00T-/U)FN-$V.@D&`83,*F)5QB
+M4FE2VQ0-(20@DF(-O(HKUH0H8CD,%=&+-^.M]B8!::Q1RF@RL&TP46*0U-B%
+MB<50X!"$#S8DV:/)48JA*AC$4D<J!BD#P0,(OV(<YTY]T3((REN5W'I@#P1Y
+MG$CM$P!Q6D2#7\2K#[SUF&G0*D\&Q$A86N<FW<:#8V8N-&L;Q0FPJ20A)+-0
+M`)"27WN]#OQ#!M2(2<,[%T?&@.`(@B(D#L:T%%2B83L]CN)2(BKH-5A'N"'U
+M&!EN\YGHRWI2+K*K4E[*9%46;:;QF(R?SCK/$1I=0LRU&%6VSW.(&/95Z1-P
+M2Q-F-+4WQ=2X:E,W"1$93RGLU`@))K(R"6/#[,WJE:*X1(*7F4"ZC#@@/92#
+M&%(8L5`6S"3A0&JOJ:)=KDZMDQ:2L%QSK(/#4-"Y*1"[[[B-E2T\JJ0I3JAC
+MB?D;=^"K9C*0KHKX3V^8>I.CV$L!H)>35`M2ZH9QEA%<NS5J3.9J46:_M1<1
+MG?4UV>Q`A30=L(-&8J4!RX`FT"S%(H51.1'GG@?L)8[-HK%K>HLXPST0\@K.
+M.0JVBB]*R,L4&#01EW?[61,+)QSE0`]`'!N]>P2IX`_7`^,`A"!])"$DG#MJ
+,K_B[DBG"A(;3UI((
 `
 end
Index: stable/12
===================================================================
--- stable/12	(revision 349741)
+++ stable/12	(revision 349742)

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