svn commit: r284271 - head/usr.bin/mkimg/tests

Marcel Moolenaar marcel at FreeBSD.org
Thu Jun 11 15:20:07 UTC 2015 

Author: marcel
Date: Thu Jun 11 15:19:59 2015
New Revision: 284271
URL: https://svnweb.freebsd.org/changeset/base/284271

Log:
  Update tests after sizing changes to the fixed VHD format.

Modified:
  head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
  head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu

Modified: head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-apm.vhdf.gz
-M'XL(".W%'50``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K571:L(P%'WW
-M*R[L35A)DYM;][@Q?1O(9,]:;2N%J<4)VT,_?DF3V-16<2/I)23<YO3DG.26
-M,=,`4(+DP%0P&Z+IV_E%0#U]CU1CD6OUR(#%MU9=AXLN6CT:&T"NTY(!9KUU
-MP@>,NXEZ_G8):.`T/XPA83IH`R3OXO=<59_Y`!P/M5T#)_KL9-&,8X"$0X)`
-M3[:G`BC7:<MN6:7'4WDJ#_NE at T,%1YE>G/R%W2ZM!MG)P-[BG=Y.[(!;P*ZW
-MX/AAZ+.'C1VDA5=&J$`.4@`B\$P1ESJGYCW`V3'/7Q:OCQ^SA:\?8F!^=(=^
-MW-//7!)?/_#Y46C]Z*9^B8`D&3B;K7Y?W^8 at .GZ!]8N9U8^E`_WU1#V/NH\!
-M1`L8C"'9ZDS"WG4MHG`U8.(#\M;>!G!SV.>;4_GCWV"RU;DHAD.OYT+_"R@!
-MGC8E)M-CC]_#=#LN=UL'YZJ?^[#R^FSQY2ZIN]V9,KB!7+7L1%\D\M5;(S"$
-M..YLW+);^>H9.#QO-B]@+1N:+CJ33F*P-FNXIOKY+__76P-'@8^*^E&.?@&@
-'6R\`T@<`````
+M'XL("+F;>54``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K57+:L,P$+SG
+M*[;T%JC18R6YQX8FMT)H*/163&RGAB8Q::`]N/]>R9)B^9&0%LL;8['6>'9F
+MI1!B!P`*$`R(#N*"4>`(S;P34,V?(SUN,'*CFE at P2BZL.@\7=48UF5I`9M*"
+M`*:]=3P$I.U$M7SJ`EHXPP\I*&)"KD&*J_@]E.5'-@#'QBK7PO$^.Y'7SQ1`
+M,5`(\M[=90XR,VG'[JU,#L?B6.QW;QX.-9Q,S6+U%W;;I!QD)T;V%J_T-O9-
+MZ0#;WH+GAV/W'M9V2".\-D(',A`<$(&EFK at P.3WO`2X.639;/=Z]+%:A?H at C
+M\Y-7Z,<"_>PF"?6#D)\<6S]Y43_%0:F!WFST^_RRC>CYC:P?)4X_D at S<SR>J
+M9=2^+"`ZP-$8(I.Q24ON]KH1D?LS(`X!66-O#;C>[[+UL?@.=["!,P[G^7"8
+M]8R;_P*I@"7U$9.:YX#?[7PS+;8;#^=//_]A[?7)XFZ5.B'CIMR%-KB&G+V?
+MV/&^2,TJ_5.ZSQ$H;17NV&F8Z*==+)Z*S7(0<4W31VO22ABXU[89%JX^_<*7
+4_^NMA9,CMTI"R.076*/W'M('````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,13 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-bsd.vhdf.gz
-M'XL("._%'50``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD9BYO=70`K91-;X,P#(;O
-M_`I+N_6`DI`8>JW6G2=-VJX%"E4/W2X[[)`?OQ@"Q'RUFPA1!'+\\-I.+$0[
-M`+0"D<^LRP9[B/ECHUW4T!0!30K:@$'(W'8Q3/;!#/;C^!Z'PWJ<7/-:QL6C
-MT>'4/5PO6#Z"2\A+,DHRX)8,+4YXEAAP>DV=RX2H_A2LV2IW76VSD5]89Y`U
-MR#.(S-L4!_;UA4'??BI#L7!7],$TW)QP*=\O`YRZ$RYP7+%:VW5U8JJNW+ at 8
-MR?AF/'AS"<)O;HM3VS8"U706=P+=KNFZ;+"O,7]:H/;`S3*(OO=A`E@#5H"&
-MWE,-N(<T"X&*GR1;?GU6Y??U)ZPPX:@@=3T_R5\E=%LP!9733_!,[X&^I^-E
-M=[U=.ES7JKH?:Z2D&P?1DW"1A_MR>'MND*=!73)-$H;9*S0(#5*RP+VZ$S_.
-IA--]L%4-A6ED=I-],,-LJR*<$2.O_]:VQ>'&1\4=ON at 7D=A:0S`'````
+M'XL("+R;>54``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD9BYO=70`K93!3H0P$(;O
+M/,48;VM"VJ$MW2MQ/9N8J%>6A74/ZL6#!WQW.T"A`PN[&DJ!DNE\_#/35HBV
+M`2@$D9]YSAOJ+.97'6VBAH8$U"DH#=J`==/%T-D',]0ON^<X;'6'DTM>\[AX
+MU#P.+^%ZP?(:7$)>P<Q$`<H>-V=H<.JF1=';X]22.I<)4?XI6+U6[GQM[<@O
+MK#/@'D0!PG8VY$"J[QT-8-"WG<I`%NZ"/IB&FQ,NY?-E@,,+X0+'[1=KNZC.
+MUS;$%2L7(QGOC"MW+D'XSFUQN.Y!@,W)XE:@FS5]SAOJQYA?+5!UP-4RJ-!8
+M,IL$3`6F!*-IG"HP6TAM"$2^DNKB\Z,LOD[?884)1P6IJO.=_#&AW6)2P)Q^
+M8 at XT#O3=[HZ;T_O1X_Q1Y7^L#"5=.XB:A.L,Q@[A/F1/]PTR>^O5)=,D#5[N
+M3@\@%$C)`N_4.4S\PX-5?;!E!=HV,GUG'\Q`N-?Q444X+49>_ZUMBS,K+Y5<
++B. at 7"Y_:'#`'````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-ebr.vhdf.gz
-M'XL("/#%'50``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K96Q;H,P$(;W
-M/,5%W3)$MK$/LD9-YTI5VS5`(,J0=NG0 at 8>OC3'Q82"D,A at P.M_'?[ZS8<P>
-M`/H:;=.&9CLXFM5FU=)X\3"PKD>!%E=J+SU`MUQU'=T8]W"<@>#3^M8^[A0[
-MW/HQH%*0YP'PW>D3QDL*8/G(?=K0[+?T[/5)`U0I2`4*(1-+`_X\?(RE0_)8
-M\V=QXAZN%\R7X!+CY8WT*V/:T-S*Q#X=3LZITPA6/12LBEQ[,AOX^7D&IE=)
-M"2SK;(("^_S"3=\NE"%(N#/Z(`PW-[B4CN<>3MP)%RBNF,WMO+IUJ*Z,G`PU
-M7!D+5ZZ!T)5K<2+N1B#:G457H!X5WJ<-S>N6GA8H.V"T&<3N5X0)8`U8`2K3
-M3R7@#M+,!PI:24WY_565/Y=?/\,&Q_L_1]B,OTC,:L$41&X^@B?3]_0]'<Z;
-MR_7L<&ZK<A^6:"9=:8@,PD4:[LO^[;E%'F_JDG"2T)^]0@*3P#D)O%-WI.6,
-I[3[O at JUJ*%0KTS7R0 at RC6Y7!*3;P^F]N+0XCEXJNO=4?V8%!.+\(````
+M'XL("+^;>54``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K94]<X,P#(;W
+M_`KENF7@;&$;9\TUG7O7Z\=*"*09VBX=.M#_7 at OS86, at 2<]@P)RLAU>6;!BS
+M!X"Y)MN\H4Y&1[W:K!H:/]P,K*I)H,45QLL,,"V7;<<TQAT<9X!\7M_:Q1UC
+MAUO=!I02\CP`/G?ZD+P$`LLG[O.&>I?X9Z]/$%!F("1(!1JO#?AU_S*5#L%C
+MS9_%X25<+YA?@TO)RQGI5L:\H1[*Q#X[G%A29Q"LO"E8&;GVA![YN7D&9E9)
+M`4RW-O2!?7YAT+<-9:`7[H(^",/-"9?YX[F#PPOA at H\[+.9V6=TZ5%=$3H8<
+MKXPK5RY!_)5K<1AW(\!F9S$5:$:%]WE#_9CXIP6*%AAM!@4J36:5 at JI`E:`D
+M]3,!:@N9=H'H5U)=?'V6Q??YQ\TPX7C_YP@;^6-*JT5E@#E]1!VI[^B[VY\V
+MYX]3A^NVJN[#0M&D2P,10;C&H/00[L/NZ;Y![MY[=6DX28.7N;(C,`&<>X&W
+MZ at PF^?6#%7VP9052-S*[YKUX!L*]C;<JPDDV\OIO;BU.12Z5G+'5'\M!HE._
+#"```
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-gpt.vhdf.gz
-M'XL("/'%'50``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD9BYO=70`K9<[;]PP#(#W
-M^Q4LNJ6HH_?IE@`-F@#=TD>V#O%#"C+DBJ(=.OC'5Y3LL^23C%XAFS!TH/F9
-MI$G11T at X``0#TF:N9<5XVZ3GN+O:>1KM+ at .ZYZ,+*V#C@`'7.R5A>(\Q8.TD
-MA'JK8.R$DV7M<<URD";"#;'52LJ*&-<$W!RNO0PH);3M&?!Q]H_YUR%!*!`'
-M8.Y^`H*"9"#%">=CEWWLW]W])WCX\.4;PKXOX3+JE`,#W4-_`-NMO*/_'F[`
-M.8<P^\QF@^5%W'4>QQ$W;.!R4L:)+:M00Y<$*TEJI6,K;J#C8%MHAP+N9H53
-ME2M/H+I3L.]!&9`4>HN+00&E`-JUB?80!LRY>(`]!=8A<#Q^;HX!]K[Y^6[R
-M3]"I(G)25I2R)[!4B"Z%N\?:W at P74AROG3V-V9/5LG>8BB4G944Q>VW(7CY)
-MF+U<ZSK<E+7F38KKZF:/^JGA^L/MW^?7LF)\:-(S`,4$K.:AM+:OV!V(J]@=
-MB*O8'8BKVAT(K-@=B*O8'8BKV!V(J]H=#FA(O2&..*P]KL%0V'/HTJHIC^-1
-M-[^"8]=)N(9MC?Z-(9Y_&:;B$$?<YA"WIA3LB;,*MN(01US5(:ZFSV_%0?G^
-M4A+7>P'*M92. at 6RI&0_L?QQ-__OE3YP]Y7=F6#Z25X+VC&-A*M<B+3Y$#;B.
-M_'M[]WSU\OH\X]@4U?Q at K&A7Q0XBSL)5:;CWMU\_>N33XEUFFU)Q]CH!1.`6
-M$P<^>?>4EHKR7T!SL,:"EFA[DN1'HL at 6,N)\J<0W_^^[#;C:I>+^&NS^`N3M
-&#A:S#0``
+M'XL(",*;>54``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD9BYO=70`K98[;]M`#,=W
+M?PH:78H4%>ZMTQ(@1F. at 6_K:NDBRE&2(@P`=.JC?O>2=7B?KA+HX^2S(H/@3
+M_SQ2-&/^`%`"6+ERCANZ0Q9^NMW-SM%X=1T0GT\A+(`9`CVN1B,3=$_30-OV
+MBW'GY9VE`L'[ZP&7C8?:9S/<:?2Z7''##.>/26Y['5!K*,L+X(\A/N&V0X,R
+MH`H0>#\#Q4$+T&K$.:VZGL=W?_P,#W=?OQ/LYR17<#36`NH<"@&\6$3'_UVN
+MQV%`(.4RVP-.QG!ROXZ3A.,;N+4%'8_ at U):7KZ%KQ&H6>MFYEVR at DM"64)XB
+MN-L%SB2N/$7FRD!>@VE`<ZA;NC at 9X!S`8IM8!Q$@,,0"<DQT1<#N_"4[>]C'
+M[.U#'Y_B?46LK;@AECU%I<)L3&Y.M;TI%T*<3)T]2]G3R;)7],6RMN*&:/9*
+MG[WU)%'V5ENF&[*6[4-<E39[W$T-[`]\?U^>XX;N(0L_'JAZ8+((E3`INX-P
+M";N#<`F[@W!)NX.`";N#<`F[@W`)NX-P2;L#@8:E&^*$<T,<YP]F7Q(T"",Z
+MCBF^(Z%D*->(K=$?'^*1S3`)ASCA-H>X%!MBW2$68A,.<<(E'>((M&0V$HSK
+M+Z/I.E=@L*7L'"BFFG'`^O7<U+^>?R^R9ZE4QC_)BT7^0E)A&FR1DAYB3G0]
+MB^_=_>/-\\OC@!.]JN'!5-%8Q0A1%W+18.PD]WCX]LDA#T]C="NOJ<D+OSEN
+M at Z)7S%QX'QUBLC^A6#6*;5H0EGS'%?P(#(1[OU)YUI7*_.;_W5N/2UTJ)6.[
+)OZ@^X(6S#0``
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-mbr.vhdf.gz
-M'XL("/+%'50``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD9BYO=70`K96Q;H,P$(;W
-M/,5%W3(@^[`/LD9-YTI5VS5`(,J0=NG0 at 8>OC3'8.)"D,AQ@=/;'?[ZS8<P<
-M``*!%5?N\XYVE_AGN]JL.AHO'P/F#)HF`"8*:'"5PJD.R at K9-Y0Q#EJXNI1Q
-M!LC[MC%HD_%8)P[N.(P*;=[AXA*#L^$VCP&EA*((@.]6'\9.A]!`F8&0(`ER
-MO#?@S_W')&"#X['FS^#P%FX0S._!I7J4T].MC'E'.Y:)>5J<6%*G$*Q^*%@9
-MN?9$/AGGYAF86B45L+SWH0\<\@NCOFTH`[UP%_1!&&ZA<9G?GSLXO!$N^+AR
-M,;?+ZM:ANBIR,N1T9=RY<C7$7[D&AW$W`NQV%E6!JE=XGW>TKXE_&J#H@=%F
-MD/I?$:5`#5`-)'4[$T!;R'(7B'XEM=7W5UW]G'_=#&L<'_X<H>GQF.K50AE@
-MH3]"1]UV]#WM3YOSY61Q=JNR'Q:D)UTJB`C")3_<E]W;<X<\C.K2<)+(G;U2
-M`!/`N1=XK^[@ES-U^[P-MFZ at E)U,:]Z+Y[BZ56F<9)-1_\VMP5'D4E&UM_H#
-(GF2M3+\(````
+M'XL(",:;>54``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD9BYO=70`K94]<\,@#(;W
+M_`KUNF7P`09,UES3N7>]?JS$L=,,;9<.'=S_7LGX`TSM)#UBV2$G]/@5$H0Q
+M]P&0`IC]XSGO:+99>#6K]:JE\?UU0,. at KB-@AD"'*Q&'$]"LZ at 9HC`,)QQN-
+M,Q"\&SN#)AL_-YF'.PQ1L<T[?%SF<'VZ]75`I<#:"/C4ZQ.IRR$)J`J0"I0&
+M(RY-^&7W/$G8X7BJ]7,X<0XW".:7X'**\F;ZG3'O:,8V<=\]3BZI0P2KKDI6
+M)>X]:29Q?IV!X2XI at 9G.)T+ at 4%\8]6UB&2)(=T$?Q.E:PA7A?.[AQ)ET(<3M
+M%VN[K.XF5E<F+H::[HP+=RY!PIWK<"+M02#:DP4[$&?%SWE'\Y"%EP/*#IAL
+M!:70AMPZ!UV#KD`K&A<2]`8*XP-%V$E-^?E1E5^G;[_"A./#/T=L%"]RVBVZ
+M`&'I)?I`8T_?[>ZX/KT?>UQ_5/4OEIH672%$1NFB0YLQW?OMXUV+W+X-ZO)X
+MD<8HO(L#,`F<!XEWZA"3_83)RB'9J at 9E6IF]!3\"!^%>IT<5X12;1/VWM at ZG
+/$[>*96SU"XRD3B>_"```
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-pc98.vhdf.gz
-M'XL("//%'50``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5L6Z#,!"&
-M]SS%1=TR1/BP#UBCIG.EJNT:0B'*T';IT(&'KVU,\&$@266PD-'AC__WV><D
-MZ2X`B9"4$\_Y0+O;\KM=;5:6)IK[@$I!&0)?-=#BT. at K)%02=&_4H&F&Q at +M
-M=G3U.*&#(<B-F at U,X)Q=&7G^T!I6&4@%BB#'6Q6^[]\F#&,\PQT.K^$N at L4M
-MN-2,\K[4:E%<<'.!#K=VK/6`DTOJ-"*I[S*KXBX6Q'PTSL\S)'H-5Y#D+H8<
-M>,DO#/J*4`8RNPOZ(+1;&ES&OQ<>#J_8!8X[+N9V6=TZ5%=%3D8ZWADW[EP#
-MX3NWPV'<0B!M9=8KT-3(X#D?:)^W_.Z`T@&CS2"YLX-2H`:H!E*FGTF@`K+<
-M!R)?26WU_557/^=?/\,&)T85W6]F/*9FMU`&6)J?T(?I>_H>]J?-^?/4X_I2
-MU?]8DIETI2$RL$O<[M/NY=$B#X.Z-)PD\F?OJ$\H"4(PXT[=@2]GLOGMS=8-
-D')65V3?VP@*3I<K at 5#(:]=_<=CB*O%3TJ;;Z`TU!^3)P"```
+M'XL(",F;>54``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V4/4_#,!"&
+M]_Z*J]@Z1/;E[+AK19F1$!]K"$GI`"P,#.&_X\NG'3=IBYRXD:O+/7E?GWU"
+MM!<`(8C\Q',^4.\2_ZY7FU5#D]5U0*4@#X&/%MC at D/5M"0H".YL,J*IQ>($Z
+MF5P]3MI@".JR9@,G<)U=BKQ^V!A6&9`"I<'@I0J?]T\G#&,\PRT.S^$&P?(2
+M7,I9SIM6+<H!-Q=H<>N.M1YQM*3.(D1YE5D5=[, at FDF>6V<0=@\7($P70Q\X
+MU!=&?=M0!GIV%_1!:#=G7.:_+QT<GK$+/NYUL;;+ZM:ANB)R,=+IR;CPY#+$
+M/[DM#N,V`FHZL]V!W".#YWR at OD_\NP52!XRV at H3:<%BGH"O0)6C%\XQ`;R$S
+M+A#]G5077Y]E\7W\<2O,.#GIZ.[@?$SYM.@,,.>/Z#>>._IN]H?-\>/0X_I6
+MU7^8-"^ZLA`*[-J`-J/=N]W#;8/<O0_JTG"1QBS[R]Y`$$CI&>_464SRZYNE
+IP6Q9 at 3*-S'YX?[P`XUZFK8IQ2DRR_EO;%J<C;Y5<B-4?7X$:67`(````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-vtoc8.vhdf.gz
-M'XL("/7%'50``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME,MN at S`0
-M1??YBBMUEP7R<PC;JLVN4J7^0""8J(NV4M5%%_[XVK%)L'$>JC"#!1KF>*X]
-M#&-A`(I0"Y#VI at 2TA%*0Y!P]G']NL-MO8Q[?GNBE"L.N`HP[9S&$77/8*AMV
-MM8[`31+'KP,W8`V8*`(#KCE'-3=QU_(+N'8IN0'7W8LC-_?H#8S)<+L);K_P
-M8?"97`-WX/(^(,OE<B]79M_S.%_`.8=EL_P"[BQ73$)$@N.E[%"%.\7U)UR>
-MXPVQK)B=6;14^'`OKF_1&4@)J6<XJ2-.^"CMOF\+\V6'?:W2*Y2*BL#%:H]B
-MHR()&D#FV*LD:@5J4&^F0)$<,^S^Z]/L?]Y_I_M'L5$-0]E\O'!-T"U20[1^
-M$>K]\R2_A^?#^OWC,.)$5#4N[%KJJ9/F*BF5NW5]=/QU1YR<;Q)-=Z]38`J<
-M)\)C=KNT6#Q.G<2:`9T^ICE:\I(XBK7G<9IE4?\O98^CA4O%U=[J#P!,R,C=
-#!@``
+M'XL(",R;>54``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$]/A#`0
+MQ>_[*9YZVP-IAU+ at NM&]F9AX\2 at +9=V#FA@/'O"[.Z6PT,+^B:$4`GG,K_/:
+MR0CA!J`T4H).[%2$)(92B!4+%5B?3C3;+V,VS_?J,7*C63F89'$V1)P3FB at 8
+MS6K=`3,O3IX'9A`Y!,T"'2X?HO*+N'/Y.5RQE%V'VUV+T_RL4!D8$^!>1[AR
+MX<.0$[L&?.`DVV*Y!+Q1 at 5UI[;K@\(3E*1P+S0#R<8-=&H60AY-SV2%RMX^K
+M!ER0XX7=\_/K<6;14I'UM;BJP,Z`""*>X&Y['-FHA/\O9IZGA>8I\B]7*JH#
+M+E9[BG1F91U#U]"F[54Q4 at 6=(\W&0/*.&4WY^6'*[\//>/\LSC:JNIZ?-IZX
+M"?(B*:BPB^C*OH_RNWO8KP_O^QY'G:M^86ZIQTX:NF1!9X/=+??1%KEY.V87
+M3S=IB.([Y<:L(*5GO,N.,=&O;U8=S9H:2=:FV4_OPQ,L[B6L/8M+1!#U_U*V
+1.+UPJ11"K/X`5,-&%]T&````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-512-apm.vhdf.gz
-M'XL(".7%'50``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"M54UOPC`,O?,K
-M+.V&M*I-'(<=-PUND]#0SE!HBRH-J!C2=NB/7SYI2 at MB4U,K2N3F]?G9<>/8
-M#@`4(!C$RF)GW,S-_L*@GKY':L21'_7(@B6W3EV'BRY&/1I;0*;=(@;,.N=X
-M")BT'?7\[1+0PFE^F(",M=$&2-S%[[FJ/O,>.#94N!:.=]F)PJP3`,E`(M"3
-MFZD`RK7;L5M6Z?%4GLK#?NGA4,%1I at _+O[#;I54O.S%P;O'.W*);,`?8SBUX
-M?CAT[:%)!VGA52*4(0/!`1%8IH at +[5/[#N#LF.<OB]?'C]DBU`]Q8'YTAWXL
-MT,]>DE`_"/G1T/K13?TD!RE[:K/1[^O;%J+G-[1^$Z=?G/;,UQWU/&H_%A`=
-MX&`,R75GXNZN:Q&Y[P&3$)`UZ36`F\,^WYS*G_`&D^O.1=%O^CSC^E]`$EAJ
-M6DRFUP&_A^EV7.ZV'LYW/_]AE>MSBB^CI':X,Y5@`[EJV/&N2!2JMT9=RTG2
-M"MRQ6X7J63@\!YL7L!:&IK?6IN7H[<T:SG2_\.7_YM;"T<"EHGZ4HU\LKXQY
-$T@<`````
+M'XL("*2;>54``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"ME5UKPC`4AN_]
+M%6?L3EA)DY.DNYQ,[P8R&>QN%-NZPM3BA.VB^^_+ITT_%#<:CZ7E-(]OWG,2
+M";$#`#EP"D0%<4%C8`C-<R>@GC]':MQ at Y$8]L;"87)AU'A=U1CV96B#5:4X`
+ML]X\%@+C=J)>/G6!%J?U80R2Z!!K$/PJ?0]5]9$/X.A8R[4XUE?'"W,?`T@*
+M$D'<NZLH0.0Z[=2]5>GA6![+_>[-XU#A1*8GR[^HVZ;5H#H^<FWQRMJB;TH'
+M;-<6O#X<N_?0E$-HXU4A5"`%S@`1:*:$<YU3SSW at XI#GL]7CW<MB%?J'.+(^
+M<85_-/#/;I+0/PCUB;']$Q?]DPRD'.C-QK_/+]N(7M_8_B7./Y(.7,\GZF74
+M_E@@.N!H"I$*`Q3,[75M(O-G0!(":5->`USO=_GZ6'Z'.UCC=(6+8CCT?,KT
+M?X&00%-SQ&3Z/M!W.]],R^W&X_SIYW]8U?I4XNXJ54(DS7(7JL`&.7L_J6-]
+MDYI9ZBLSW<MQW%JX4Z<PT4][L7A:;%X`3XQ,'ZV'5D+C7MO%L#AS^H4O_[>V
+1%B=&;I64D,DOU%=49]('````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,13 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-512-bsd.vhdf.gz
-M'XL(".;%'50``VEM9RTQ>#$M-3$R+6)S9"YV:&1F+F]U=`"ME$UO at S`,AN_\
-M"DN[]8"2D!AZK=:=)TW:K at 4*50_=+COLD!^_&`+$?+6;"%$$<OSPVDXL1#L`
-MM`*1SZS+!GN(^6.C7=30%`%-"MJ`0<C<=C%,]L$,]N/X'H?#>IQ<\UK&Q:/1
-MX=0]7"]8/H)+R$LR2C+ at E@PM3GB6&'!Z39W+A*C^%*S9*G==;;.17UAGD#7(
-M,XC,VQ0']O6%0=]^*D.Q<%?TP33<G'`IWR\#G+H3+G!<L5K;=75BJJ[<N!C)
-M^&8\>',)PF]NBU/;- at +5=!9W`MVNZ;ILL*\Q?UJ@]L#-,HB^]V$"6`-6@(;>
-M4PVXAS0+ at 8J?)%M^?5;E]_4GK##AJ"!U/3_)7R5T6S`%E=-/\$SO@;ZGXV5W
-MO5TZ7->JNA]KI*0;!]&3<)&'^W)X>VZ0IT%=,DT2AMDK-`@-4K+`O;H3/\Z$
-HTWVP50V%:61VDWTPPVRK(IP1(Z__UK;%X<9'Q1V^Z!>1V%I#,`<`````
+M'XL("*>;>54``VEM9RTQ>#$M-3$R+6)S9"YV:&1F+F]U=`"ME,%.A#`0AN\\
+MQ1AO:T+:H2W=*W$]FYBH5Y:%=0_JQ8,'?'<[0*$#"[L:2H&2Z7S\,]-6B+8!
+M*`21GWG.&^HLYE<=;:*&A at 34*2 at -VH!UT\70V0<SU"^[YSAL=8>32U[SN'C4
+M/`XOX7K!\AI<0E[!S$0!RAXW9VAPZJ9%T=OCU)(ZEPE1_BE8O5;N?&WMR"^L
+M,^`>1`'"=C;D0*KO'0U at T+>=RD`6[H(^F(:;$R[E\V6`PPOA`L?M%VN[J,[7
+M-L05*Q<C&>^,*W<N0?C.;7&X[D&`S<GB5J";-7W.&^K'F%\M4'7`U3*HT%@R
+MFP1,!:8$HVF<*C!;2&T(1+Z2ZN+SHRR^3M]AA0E'!:FJ\YW\,:'=8E+`G'YB
+M#C0.]-WNCIO3^]'C_%'E?ZP,)5T[B)J$ZPS&#N$^9$_W#3)[Z]4ETR0-7NY.
+M#R`42,D"[]0Y3/S#@U5]L&4%VC8R?6<?S$"XU_%113 at M1E[_K6V+,RLOE5R(
+*Z!<+G]H<,`<`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-512-ebr.vhdf.gz
-M'XL(".?%'50``VEM9RTQ>#$M-3$R+65B<BYV:&1F+F]U=`"ME;%N at S`0AO<\
-MQ47=,D2VL0^R1DWG2E7;-4`@RI!VZ="!AZ^-,?%A(*0R&#`ZW\=_OK-AS!X`
-M^AIMTX9F.SB:U6;5TGCQ,+"N1X$65VHO/4"W7'4=W1CW<)R!X-/ZUC[N%#O<
-M^C&@4I#G`?#=Z1/&2PI@^<A]VM#LM_3L]4D#5"E(!0HA$TL#_CQ\C*5#\ECS
-M9W'B'JX7S)?@$N/EC?0K8]K0W,K$/AU.SJG3"%8]%*R*7'LR&_CY>0:F5TD)
-M+.ML@@+[_,)-WRZ4(4BX,_H@##<WN)2.YQY.W`D7**Z8S>V\NG6HKHR<##5<
-M&0M7KH'0E6MQ(NY&(-J=15>@'A7>IPW-ZY:>%B@[8+09Q.Y7A`E@#5@!*M-/
-M)>`.TLP'"EI)3?G]594_EU\_PP;'^S]'V(R_2,QJP11$;CZ")]/W]#T=SIO+
-M]>QP;JMR'Y9H)EUIB`S"11KNR_[MN44>;^J2<)+0G[U"`I/`.0F\4W>DY8SM
-H/N^"K6HH5"O3-?)"#*-;E<$I-O#Z;VXM#B.7BJZ]U1_9 at 4$XOP@`````
+M'XL("*J;>54``VEM9RTQ>#$M-3$R+65B<BYV:&1F+F]U=`"ME3US at S`,AO?\
+M"N6Z9>!L81MGS36=>]?KQTH(I!G:+ATZT/]>"_-A8R!)SV#`G*R'5Y9L&+,'
+M at +DFV[RA3D9'O=JL&AH_W`RLJDF at Q17&RPPP+9=MQS3&'1QG@'Q>W]K%'6.'
+M6]T&E!+R/``^=_J0O`0"RR?N\X9ZE_AGKT\04&8@)$@%&J\-^'7_,I4.P6/-
+MG\7A)5POF%^#2\G+&>E6QKRA'LK$/CN<6%)G$*R\*5 at 9N?:$'OFY>09F5DD!
+M3+<V](%]?F'0MPUEH!?N at CX(P\T)E_GCN8/#"^&"CSLLYG99W3I45T1.AARO
+MC"M7+D'\E6MQ&'<CP&9G,15H1H7W>4/]F/BG!8H6&&T&!2I-9I6"JD"5H"3U
+M,P%J"YEV@>A74EU\?9;%]_G'S3#A>/_G"!OY8TJK166`.7U$':GOZ+O;GS;G
+MCU.'Z[:J[L-"T:1+`Q%!N,:@]!#NP^[IOD'NWGMU:3A)@Y>YLB,P`9Q[@;?J
+M#";Y]8,5?;!E!5(W,KOFO7@&PKV-MRK"23;R^F]N+4Y%+I6<L=4?RT&B4[\(
+"````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,18 +1,19 @@
 # $FreeBSD$
 begin 644 img-1x1-512-gpt.vhdf.gz
-M'XL(".G%'50``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"METMOU#`0 at ._[
-M*P;U5D2P'=O)'EO12MS*Z]9#\["KE6`1$@<.^?%X_"!VU at X4.1E%64W\99X9
-M+R'N`.`,R)"YEA7+;9.>R^'Z8&ET?!G0O!]-V``;`W2XR2@)PV>4`JV]$&I7
-MN<5&6K+>6URS'J2)<'.\:B-E18QK'"ZXJU\&%`*&X0+X)=C';#H$<`G\",P\
-M3X!3$`P$_X.SOHLIMN_N_CT\W'S\C+#'U5U&C5+-0%J01]#SQCI:=O>T<=?A
-MC$$8?::SSK9%W-MM]!RN1=R\@\M)&<?W5KD:^K?<.IP at Z:H^7M4+Z!G(">:A
-MB/N:X&3ERN.H'B5T$T@%@L*D\6:60*FQS[1);R$,F,G[$3H*;$3@<O[0G!WL
-M3?/CM;>/4U\1.2DK2M'C;*\BT*B_N`LIKJT=O1ZC)ZI%[^B+)2=E13%Z at XM>
-M/DAH5*YU#<Y'K7F5XL;*T9.H-OUAOM^7U[)B>6C2TP&Y!U:S4&@]5>P.Q%7L
-M#L15[`[$5>T.!%;L#L15[`[$5>P.Q%7M#@-4I-X01YRMO<XFH(51I684Q_$2
-M$A'&9<"QO=&_,\3SR5`5ASCB=H>X5D5GP[%QMN(01US5(2[]]EN:W9GM+RGP
-MON.X6>OZ&,C6FK'`Z?M933]/O^+H(8ZZBL@*KF<M%J;L@`WX$CGC?63?U=WS
-M]>G;<\`Q[U5X,5:TJ6(#X1?NRM3=^]M/[RSR:;4N\YF2<?1&#H3C)R9VW%OW
-ME):*M#N at X*S2F$O"5TE^)(IL(2/.EDK\\/_FUN%JEXKY:W#X#1@%S56S#0``
+M'XL("*V;>54``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"ME4N/U#`, at ._S
+M*SS:"UI$E3B/9FXP8E=P6V"Y<>ES60D&(7'@4/X[<9(^TFD&=I4T4V7D^*OM
+MV#%C?@!(!%9MO-."X5C$S["[WCD:KY\&M-\G$U;`P@(]KK%"AK2GZZ#OPV3<
+M:7EE(0%Y6(^X8AIR7RQP[:1U/M."!<Z/V=W^:4"EH*K.@)]'^]`=AP*I01X`
+M[7X&DH-"4'+".5]5L[3OYO8]W+WY>$^P+[.[R*VP;T$:$`B\7UG'D^Z^PY6[
+M'F<-`B'6T1YQ(H43^W7T/$X0CE_`;4T8>`(G+VGY'/J_L_4XQ6(ML]0R"@R"
+M;J"MDKAO$4YGSCQ)XEI#V8#N0'%H>EJT&CBW]MDR,0Z"@"VP`Y0VT#4!A].'
+MXN1AKXJ?+X-]DH>,V)II02IZ$B]E!!GU#W<AQHG<T3,4/94M>H>0+%LS+4A&
+MK_+1VPX2&;59,L,8M6(?X^K,T=,DMO5A[^_S=UHPW!7QXX$R`+-9*%'GK`["
+M9:P.PF6L#L)EK0X"9JP.PF6L#L)EK`["9:T."W3)G*F)$\XU\9[B7`N0*S.2
+M[9CL>TTH$;NK\5+K3S?QQ&'HC$V<<!>;N$B?;1BX<C9C$R=<UB9N at 8;$6H!V
+M]:45K4L)VI:460)QSAD';'Z<NN;7X^]5]$Q(E<U)^B at H,74)6-%'=$OKA7U7
+M-P_7C]\?1AP&K\8/4T;;++80>>:N%6 at SNWM[_/36(8]?)^LVKJE9R_Y*>YE(
+MNF*6C@?K+*;X$SLK)V>['M"0[C2C/Y&`<"\V,L^X5%EN?N[9>ESN5*D8V_T%
+(**T"\+,-````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-512-mbr.vhdf.gz
-M'XL(".K%'50``VEM9RTQ>#$M-3$R+6UB<BYV:&1F+F]U=`"ME;%N at S`0AO<\
-MQ47=,B#[L`^R1DWG2E7;-4`@RI!VZ="!AZ^-,=@XD*0R'&!T]L=_OK-AS!P`
-M`H$55^[SCG:7^&>[VJPZ&B\?`^8,FB8`)@IH<)7"J0[*"MDWE#$.6KBZE'$&
-MR/NV,6B3\5 at G#NXXC`IMWN'B$H.SX3:/`:6$H at B`[U8?QDZ'T$"9 at 9`@"7*\
-M-^#/_<<D8(/CL>;/X/`6;A#,[\&E>I33TZV,>4<[EHEY6IQ84J<0K'XH6!FY
-M]D0^&>?F&9A:)16PO/>A#QSR"Z.^;2@#O7`7]$$8;J%QF=^?.SB\$2[XN'(Q
-MM\OJUJ&Z*G(RY'1EW+ER-<1?N0:'<3<"['8658&J5WB?=[2OB7\:H.B!T6:0
-M^E\1I4`-4`TD=3L30%O(<A>(?B6UU?=77?V<?]T,:QP?_ARAZ?&8ZM5"&6"A
-M/T)'W7;T/>U/F_/E9'%VJ[(?%J0G72J(",(E/]R7W=MSASR,ZM)PDLB=O5(`
-M$\"Y%WBO[N"7,W7[O`VV;J"4G4QKWHOGN+I5:9QDDU'_S:W!4>124;6W^@.>
-'9*U,OP@`````
+M'XL("+";>54``VEM9RTQ>#$M-3$R+6UB<BYV:&1F+F]U=`"ME3USPR`,AO?\
+M"O6Z9?`!!DS67-.Y=[U^K,2QTPQMEPX=W/]>R?@#3.TD/6+9(2?T^!42A#'W
+M`9`"F/WC.>]HMEEX-:OUJJ7Q_75`PZ"N(V"&0(<K$8<3T*SJ!FB,`PG'&XTS
+M$+P;.X,F&S\WF8<[#%&QS3M\7.9P?;KU=4"EP-H(^-3K$ZG+(0FH"I`*E`8C
+M+DWX9?<\2=CA>*KU<SAQ#C<(YI?@<HKR9OJ=,>]HQC9QWSU.+JE#!*NN2E8E
+M[CUI)G%^G8'A+BF!F<XG0N!07QCU;6(9(DAW01_$Z5K"%>%\[N'$F70AQ.T7
+M:[NL[B965R8NAIKNC`MW+D'"G>MP(NU!(-J3!3L09\7/>4?SD(67`\H.F&P%
+MI="&W#H'78.N0"L:%Q+T!@KC`T7824WY^5&57Z=OO\*$X\,_1VP4+W+:+;H`
+M8>DE^D!C3]_M[K@^O1][7']4]2^6FA9=(41&Z:)#FS'=^^WC78O<O at WJ\GB1
+MQBB\BP,P"9P'B7?J$)/]A,G*(=FJ!F5:F;T%/P('X5ZG1Q7A%)M$_;>V#J<3
+.MXIE;/4+C*1.)[\(````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-512-pc98.vhdf.gz
-M'XL(".O%'50``VEM9RTQ>#$M-3$R+7!C.3 at N=FAD9BYO=70`K96Q;H,P$(;W
-M/,5%W3)$^+`/6*.F<Z6J[1I"(<K0=NG0 at 8>O;4SP82!)9;"0T>&/__?9YR3I
-M+@")D)03S_E`N]ORNUUM5I8FFON`2D$9`E\UT.+0Z"LD5!)T;]2@:8;&`NUV
-M=/4XH8,AR(V:#4S at G%T9>?[0&E892`6*(,=;%;[OWR8,8SS#'0ZOX2Z"Q2VX
-MU(SROM1J45QP<X$.MW:L]8"32^HT(JGO,JOB+A;$?#3.SS,D>@U7D.0NAAQX
-MR2\,^HI0!C*["_H at M%L:7,:_%QX.K]@%CCLNYG99W3I45T5.1CK>&3?N7`/A
-M.[?#8=Q"(&UEUBO0U,C at .1]HG[?\[H#2`:/-(+FS at U*@!J@&4J:?2:`"LMP'
-M(E]);?7]55<_YU\_PP8G1A7=;V8\IF:W4`98FI_0A^E[^A[VI\WY\]3C^E+5
-M_UB2F72E(3*P2]SNT^[ET2(/@[HTG"3R9^^H3R@)0C#C3MV!+V>R^>W-U at T<
-CE979-_;"`I.ERN!4,AKUW]QV.(J\5/2IMOH#34'Y,G`(````
+M'XL("+2;>54``VEM9RTQ>#$M-3$R+7!C.3 at N=FAD9BYO=70`K90]3\,P$(;W
+M_HJKV#I$]N7LN&M%F9$0'VL(2>D`+`P,X;_CRZ<=-VF+G+B1J\L]>5^??4*T
+M%P`AB/S$<SY0[Q+_KE>;54.3U75`I2`/@8\6V."0]6T)"@([FPRHJG%X at 3J9
+M7#U.VF`(ZK)F`R=PG5V*O'[8&%89D`*EP>"E"I_W3R<,8SS#+0[/X0;!\A)<
+MREG.FU8MR@$W%VAQZXZU'G&TI,XB1'F5615WLR":29Y;9Q!V#Q<@3!=#'SC4
+M%T9]VU`&>G87]$%H-V=<YK\O'1R>L0L^[G6QMLOJUJ&Z(G(QTNG)N/#D,L0_
+MN2T.XS8":CJSW8'<(X/G?*"^3_R[!5('C+:"A-IP6*>@*]`E:,7SC$!O(3,N
+M$/V=5!=?GV7Q??QQ*\PX.>GH[N!\3/FTZ`PPYX_H-YX[^F[VA\WQX]#C^E;5
+M?Y at T+[JR$`KLVH`VH]V[W<-M@]R]#^K2<)'&+/O+WD`02.D9[]193/+KFZ7!
+H;%F!,HW,?GA_O`#C7J:MBG%*3++^6]L6IR-OE5R(U1]?@1I9<`@`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-512-vtoc8.vhdf.gz
-M'XL(".S%'50``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V4RVZ#,!!%
-M]_F**W67!?)S"-NJS:Y2I?Y`()BHB[92U447_OC:L4FP<1ZJ,(,%&N9XKCT,
-M8V$`BE`+D/:F!+2$4I#D'#V<?VZPVV]C'M^>Z*4*PZX"C#MG,81=<]@J&W:U
-MCL!-$L>O`S=@#9 at H`@.N.4<U-W'7\@NX=BFY`=?=BR,W]^@-C,EPNPENO_!A
-M\)E<`W?@\CX at R^5R+U=FW_,X7\`YAV6S_`+N+%=,0D2"XZ7L4(4[Q?4G7)[C
-M#;&LF)U9M%3X<"^N;]$92`FI9SBI(T[X*.V^;POS98=]K=(KE(J*P,5JCV*C
-M(@D:0.;8JR1J!6I0;Z9`D1PS[/[KT^Q_WG^G^T>Q40U#V7R\<$W0+5)#M'X1
-MZOWS)+^'Y\/Z_>,PXD14-2[L6NJID^8J*96[=7UT_'5'G)QO$DUWKU-@"IPG
-MPF-VN[18/$Z=Q)H!G3ZF.5KRDCB*M>=QFF51_R]ECZ.%2\75WNH/`$S(R-T&
-"````
+M'XL("+>;>54``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V43T^$,!#%
+M[_LIGGK;`VF'4N"ZT;V9F'CQ*`MEW8.:&`\>\+L[I;#0POZ)H10"><RO\]K)
+M".$&H#12 at D[L5(0DAE*(%0L56)].--LO8S;/]^HQ<J-9.9AD<39$G!.:*!C-
+M:MT!,R].G@=F$#D$S0(=+A^B\HNX<_DY7+&478?;78O3_*Q0&1 at 3X%Y'N'+A
+MPY`3NP9\X"3;8KD$O%&!76GMNN#PA.4I'`O-`/)Q at UT:A9"'DW/9(7*WCZL&
+M7)#CA=WS\^MQ9M%2D?6UN*K`SH`((I[@;GL<V:B$_R]FGJ>%YBGR+U<JJ@,N
+M5GN*=&9E'4/7T*;M53%2!9TCS<9`\HX93?GY8<KOP\]X_RS.-JJZGI\VGK@)
+M\B(IJ+"+Z,J^C_*[>]BO#^_['D>=JWYA;JG'3AJZ9$%G@]TM]]$6N7D[9A=/
+M-VF(XCOEQJP at I6>\RXXQT:]O5AW-FAI)UJ;93^_#$RSN):P]BTM$$/7_4K8X
+0O7"I%$*L_@!4PT87W08`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-apm.vhdf.gz
-M'XL("/_%'50``VEM9RTV,W at R-34M-#`Y-BUA<&TN=FAD9BYO=70`K57);L(P
-M$+WS%2/UAM3(\3*FIRXJW"JAHIXA(@F*5""B2.TA'U^OX"P at 6MF,+$<3/]Z\
-M9T\(L0.`"Q`4B`KB at IGY_-P):*;OB1HD\:,96;#TVJ[+<$EG-*.Q!:0Z+0CP
-MO+>/A8!I.]',W[J`%D[SXRE(H@/7 at .(F?L]U_5D,P-%8Y5HXUF<G2K-.`20%
-MR0$?W(PE8*'3CMVRS@['ZECM=TL/QQ4<YGJS_`N[;58/LA.1O>4W>CMQ"^H`
-MV]Z"Y\=CGSUN[$`MO#)"!:<@&'`.-%?$A<ZIYQ[@[%`4+XO7^X_9(M2/\\C\
-M\`;]:*"?O22A?A#RP]CZX57])`,I!\[F6;^O;WL0/;_(^J7$Z4>R@?ERHIDG
-M[9\%Y`XP&D-TW1F9N^M:1.9[P"0$I&=[#>!ZORO6Q^HGO,'HNG-9#H?>3YG^
-M%J`$FID6D^MUP.]NNAE7VXV'\]W/_['R^F1QMTILESM3!AO(U9D=ZXN$'?44
-M3U:V"G?L5F9^#(OEIV*+$KBEZ:/UT$IHN*>V&1;.=+_PY?]Z:^$P\E%1'\K1
-)+TV"K"_2!P``
+M'XL("&NF>54``VEM9RTV,W at R-34M-#`Y-BUA<&TN=FAD9BYO=70`K55=:\(P
+M%'WW5US8F["2YM.];&Q,WP8RV;.4-I7"U.*$[:'^]^73IA^*&XF7D'*;TW//
+M2:X(V0%`&3`,2`5R023D*;3/O8!F_IZH\9CXT4PL6(JN[+H,E_1&,YE:0*S3
+M#`$M!OM(")AV$\WRK0]HX30_FH)`.G at .G-W$[[FN/^4('(Y5KH4C0W:L-&ME
+MAL`@*/`'-_,2N-1IQVY=9X=C=:SVN[6'HPJ.%WJS^`N[;5:/LF.1O:4W>CMS
+M"^P`N]Z"YT=CGSUJ[.!:>&6$"HJ!$:`4<*&(,YU3SP/`Q4'*E]7K_<=B%>I'
+M:61^_`;]<*"?O22A?A#RX['UXU?U$P2$&#F;K7Y?W_8@>GZ1]4N1TP]E(_/E
+M1+-,NC\+2!U at -(:BF)GNQXF[ZUI$XGO`+`3$K;T&,-_O9'ZL?L(;K.&TPV4Y
+M'GH_)OJ_@`O`F6DQA5X'_.[FFVFUW7 at XW_W\AY779XO[58H"9K at M=Z$,-I"G
+MEAT9BM3NLM]1/$G9*=RQ.YGY*2R6GHN5TG`,HO_<)D9[LX8SW2]\^;_>6C@>
+/^:BH9CKY!5KF!832!P``
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-bsd.vhdf.gz
-M'XL("`#&'50``VEM9RTV,W at R-34M-#`Y-BUB<V0N=FAD9BYO=70`K90[3\,P
-M$(#W_(J3V#I$?L==:%519B0DF$-PJ@[`PL#@'X\OB1M?G at C%=J)8=_?E'O8Q
-MU at X`)8"5$^]Y at 3_E=/ILES4T at 4!=@-*@#=B at SOI%-D3 at 7\\O>3I\A^-+5O.X
-M?#`B3JSAHL.RGL,=$IP,PCK19#RQJCA(U^_5!.X^/,<>IY:\"YE@;DHP&ZS>
-M*G>QMG9 at E]89N`,N@=E.)BCP5E_H_=N/W1`DW`7_8!QNB;B"ZO,$)U;"!8I[
-M0QPGRGT)5[)W''M7;5P,.;P9?[RY"*$WM\6);1N!:#I+.(%!:_R>%_BGG,X6
-MJ#K at 9AFT7>\S$DP-QH'1^%TH,'LH;`H4]"3YZNO35=_7G[3"B.-M,YA<:"\D
-MWA93@"CQ)^8=OQ/_[LZ7W?7C$G&Q5<4?*X-)UP&B1N%:&N[CZ?EAZ)T<)\F2
-M[''T,VU[(7"2O4.*4[=@G6M:(.\7V1#!9*M"G&8#J__6ML69C8]*.'S9+_P)
-&SWLP!P``
+M'XL("&VF>54``VEM9RTV,W at R-34M-#`Y-BUB<V0N=FAD9BYO=70`K90[;\,@
+M$(!W_XJ3NF6P>.,LB10UG2M5:F?7QE&&MDN'#LY_+Q at 3'\:/JC+&"'3<QSW@
+M"/$-0#`@Y<0X+VA/>?RUV2[K:,P!I08A02HH['8R]&@1"=JW\VN.6]OCZ)+6
+M/"X?M8!C:[A@,&_F<$>$XU;8H)V$(JV*`C?]`L\1[N#_@!-+UME($#,EF'56
+M;A6[D-MBI(?S#-0`Y4"*7L9BX#V_,-BW3\U at D;L+]D'J;NEP.MY/$8ZMN`LQ
+M[MWA4#ZC%*Y$[Y!:5VV<##Y^&7]\N0X2OUR/8]L6`M95%GL#[:YTG!>TSWG\
+M>:#H at 9M%4-=%5ZH4!]6`,J"DFVL!:@^ZP$`6WZ2V^OHTU??U!V?8X:@O!I/=
+MZ3/N7HO2P$IWB*K='-GW<+[LKA^7@`NE*APLE`NZM!"1N*OKOM1ZW-/IY;%#
+MW@;K>!JD0<N?8^W$9<\ZWEMWZ\8C=E;<G36FLQ'U\7H03)8JAY-DI/7?W'J<
+/VOBJ"$*R7\Y^^\XP!P``
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-ebr.vhdf.gz
-M'XL("%_N+50``VEM9RTV,W at R-34M-#`Y-BUE8G(N=FAD9BYO=70`K94[;\,@
-M$(#W_(J3NF6(``,F2R)%3>=*5=O9<7&4H>W2H8-_?#EC',[&>508C$`'G^_%
-MF3'_`+ at WV><%[6KTM(OEHJ/QP_U`G at 1Z7(VG.&ZK%(Y%@TL<!USMUC:AW]8U
-M]VQBW$=N<YO[@$I!54V`KT$_D3D<I46Q%,"JQ#@O:'<KV at +0=`FC2I`*E`8C
-M;M7P??^6B*]A/)?!'B>NX8+"/H-2N&V$*YRPB7;Z3.Q/Q7D7SR/<QK\!)R]I
-MYSS!;$HP:ZS*FRS&-7HNCC-P"[P`9GJ9H,`AOG#6;SU50Q!S+^@'4W,KQ)5T
-M/X]PXHJY0'&'H;(D0GC%>YNI=G7F8/#QS;CQYB*$WER/$WD+P;JK+"X#W:[I
-M."]HGU>T>:#L@=D\:/I_FRY`-Z`M:(7S4H)>0VEBH*"9U-;?7[;^.?W&$48<
-M]\4 at V?&\*/"VZ!)$A1_1'SB/]'O8'Y>GSV/`A5(5/BPU.ETYB)R8:ZBY3[N7
-MQ[%VQ=1)AGB/HYYQV7.&$^]M8YP<C+6V*X'\W,F"")*E"G&*C4[]-[8>IS.G
-.BOOO+OX`/$*Q[A`)````
+M'XL("'&F>54``VEM9RTV,W at R-34M-#`Y-BUE8G(N=FAD9BYO=70`K90];\,@
+M$(;W_(J3NF6(``-VED2*FLZ5JK:S[>`H0]JE0P?_^-Z%X(#!^:@`&]D^>/P>
+M=QQCM@'@G;RF#?UBU/K9?':B\>9Q($\"+:ZE59RFU8K&HJ-7&@=<B^\FH6^-
+M'=O*Q^URN]L]!E0*ZCH"OCM](G,X2D-F*8#5B7':T&\687?`ZI0PJ at 2I0&FH
+MQ+T*/[<?B?A6C.=RV.+$+9P3;#,HA5M[N`*-G3?39N)YE9]W_K.'6]G;X>0U
+M=;@3S*0,D\ZJO,E280_7^7$&;H`7P*JS383`(;YPT;>,98C`W2OZ(':W)EP9
+MSN<>3MQP%T)<,U261`AO[-XJ5M=F#@8?GXP[3RY!PI-K<2)O(5B>*@MF(,Z*
+MQVE#_[H(NP7*,S#;#G8-,M&L"]`=:`-:T7,I02^AK'R@"#.I;[^_3/MS^/4C
+M3#ANBT'RHO6BH-.B2Q`U_43OZ-G3][3=SP_'O<.Y4N5^+#5MND*(C-SM&F#R
+MXN[+YNUYK*Z(-^FRRKJ).OVRAU^"W5O[.#DX:XR3Z:[@)3`D2Q7A%!NM^F]L
+1+4YG3A7-V.P/(8K+DQ`)````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-gpt.vhdf.gz
-M'XL("`/&'50``VEM9RTV,W at R-34M-#`Y-BUG<'0N=FAD9BYO=70`K9<[;]PP
-M#,?W^Q0LLJ6HHK=]2XL&38!NZ6OK$#^D($.O*-JA at S]\1<EWEGR2T0MD$X8/
-MM'[FGR9-'Z5A`Y`<:)<YEAW3+4GW:7>]\S367P9T]\<05D#B@`$W."?E>(TQ
-M8.ULE/E58;$S09=SCR/+1DF$&^-5*RL[8AP)N*-<>QE0*>BZ,^"W8WS</PX%
-M4H/<`W?74Y`,%`<E3SBO70UQ?'?W'^'A_>>O"/N^R.7,.4<.[0##'FR_BH[]
-MO]R`<P%A]KG-BA5%W$T>)Q`W;N!R5L;)K56AABX1JVBZJHU7"0.]`-M!-Q9P
-M;U<X7;GR)+I[#<T`VH!B,%@\&34P!M"Z-FD]A`-W(>ZA8<![!$Z'3^008&_(
-MK]=S?)+-%9&SLJ.4/8FE0MN2W`9K>U,NI#A1.WLM9D]5R]Y^+I:<E1W%['4A
-M>_DD8?9RK>MP<];(JQ37U\T>\U/#]8=[?Y\?RX[I@:1[`,H96"U"9>U0L3L0
-M5[$[$%>Q.Q!7M3L06+$[$%>Q.Q!7L3L05[4['-#0>D,<<5A[H at 7#H!'0IU53
-M'L=32WZ'P&X2N89OC?Z-(9Y_&*;B$$?<YA"WIB3VQ%F)K3C$$5=UB.OY\UL+
-MT+Z_M,+S1H)V+=7&0+[4C`<./P]F^//\-\Z>]F]F6#Z25X;KN<#"U*Y%.KR)
-M'O$\BN_J[NGZ^<?3$<=G5<<;8T6[*G80>297IW+O;[]\\,C');K,:TJOLN?B
-M%#81/D?WZ(_O8K'R)-98<,JI7"SYD3BRA8PX7RKQQ2]]M@%7NU3<7X/=/VC0
-&,#.S#0``
+M'XL("'2F>54``VEM9RTV,W at R-34M-#`Y-BUG<'0N=FAD9BYO=70`K99-;]P@
+M$(;O^RNFZBU5$6#`[&6K1$VDWM*O6R^VL:,<LE6E'GK8_/?. at +T&K[&Z%6MD
+M>37FX9UAQ@/GX0>@)/!FY9XWG.Y8>IUV-SM/$^UU0%R?)"R`#($!UZ&12WJG
+M[V$8QL&%GQ4F=P*J?GR><&S^'5B$<^=9ER-OB'$LX"9WA^N`6D/37`"_3_JD
+MWPX-RH#:@\3W.2@!6H)69YSW77>QOON'3_!X^^4;P7[,[DI!(AS8!CH#M5NH
+M$QONOJ;N!AP*`MR01;0G7)7%'9;1"[@*C6V_ at 5L;>9S:FA5RZ-_V-N`T3V?9
+M>!9J;BL8&FA<!G=8X$SAS%-D;G%7.S`]:`'=0`_.@!``%LO$>H@$B1+W4`N0
+M+0%/Q\_L&&#OV:]WHSXEQHQ8&WE#+GJ*4H7;G+LUY?:FNY#BJM+1LQ0]72QZ
+M^S%9UD;>D(U>$Z*W'B2*WEKI(FZ,&GN3XMJRT1.^:V!]X/?[\IXWG!Y9>@6@
+M&H'%%-:N[@M6!^$*5@?A"E8'X8I6!P$+5@?A"E8'X0I6!^&*5D?M;#A3E6GB
+MA*/<$WL0"H::6GDB(]N.9WV'V%W+Y5;KWVCBJYMA><$F3KC-)MX.USI;L(D3
+MKF at 31Z`_[YD*C*\OH^FY5F"PI&P,E'/.>&#W\]AWOY__+*+GSWOG0_)BT'Q9
+M46(:+)&&%C&.GB-];^^?;IY?GB:<'+V:%J:,QBQ&B+IP%T^75L[N/MQ]_>B1
+MK[.ZE<_4/"NL at SJK(7%\5!?.HQ]B9]79V=Z!0XUJ'LF?Q)!+Y'#>BU_^W[T-
+0N-*I at N>]W5^),'<SLPT`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-mbr.vhdf.gz
-M'XL("&+N+50``VEM9RTV,W at R-34M-#`Y-BUM8G(N=FAD9BYO=70`K94];\,@
-M$(;W_(J3NF6P``,F2R)%3>=*5=O9<7"4(>W2H8-_?.^,[8"Q\U%A",(Z>/(>
-M=YP9<P^`%,#*B7'>T&RSL#6+Y:*E\?UC0,.`\0B8(=#A*L3A`I19*AKSFEYI
-M)`.C7N&[[>:N0X.$;(,-GW7FX0[#KKC/&UJ<_US<K1\#*@5E&0'?>WWBJHS'
-M]14V<7Q-FS"J`*E`:3#B7H6?NX^10H?CJ1QV.'$+UPMV&32%VWBX'(VUM])E
-M8K?+SSM_[N'6[M?CY#5U>!+,3AEFG55ID\5@"_?Y<09N@>?`3&<3(7"(+UST
-MK6(9(G#WBCZ(W2T)5X3KN8<3-]R%$+<?*LM$"&^<WCI65R4.!A_?C#MO+D'"
-MF^MP(FTA6+65!3,05\7CO*%YS<+F at +(#)CM!TWW;=`ZZ!FU!*YH7$O0*"N,#
-M19A)3?7]9:N?TZ\?8<)Q5PPF.^T7.=T678`HZ4_T@>:>OJ?=<7DZ'WM<7ZKZ
-M/Y::#ETA1$;NFM#=E^W;\UA='A^2"4Z/DTZ_[*'CP>EM?)P<G+6V+8'\TH.7
-=P#!9J at BGV&C7?V/K<#IQJN!W=_$'S:-I2Q`)````
+M'XL("'BF>54``VEM9RTV,W at R-34M-#`Y-BUM8G(N=FAD9BYO=70`K90];\,@
+M$(;W_(J3NF6P``-VED2*FLZ5JK:S[>`H0]JE0P?_^-X98X.Q\U'9$(1S\/@]
+M[CC&[`,@!;!B8IPW-/LD;,UJO6IIO'P,F#-@/`(F"+2X"G&X`&46BL:TIE<:
+MR<"H5_ANNKGMT"`AV6'#9YMXN&._*^[SAA;G/X.[]6-`I:`H(N"[TR>NRGA<
+M7V86CF_>)HS*0"I0&G)QK\+/P\=(H<7QI1RV.'$+YP3;#)K"[3Q<BL;:6VDS
+ML=OEYYT_]W!;^W,X>4T=G at 0S4X999]6RR9)C"_?Y<09N@*?`\LXF0F`?7QCT
+M;6(9(G#WBCZ(W2T(EX7KN8<3-]R%$%?VE64BA#=.;QNKJQ8.!A_?C#MO+D'"
+MFVMQ8ME"L&DK"V8 at KHK'>4/SFH3-`F4'7.P$ZQ*9:-8IZ!JT`:UHGDG0&\AR
+M'RC"3&JJ[R]3_9Q__0 at 3CMMB,-EIOTCIMN@,1$$?T4>:>_J>#J?U^7)R.%>J
+MW(>EID-7")&1NW4)3`[NONS?GL?JTOB0AEW63=3IESW\)SB]G8^3O;/&.)FN
+?!R^!8;)4$4ZQT:[_QM;B],*IHAE;_0'0:Q,V$`D`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-pc98.vhdf.gz
-M'XL("&3N+50``VEM9RTV,W at R-34M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5.V^#
-M,!#']WR*D[IE0'YCED2*FLZ5JK8SI2;*D';IT($/7QL;XL.01V5,B-'A'_][
-M^"#$'P""`:EGKLN&;E?@T:W6JYY&V_N`4D*=`E\ML,<QIZ\2T`BPL\D)O.UG
-M-#%T13BVX7_`46M,06'5HF'$%2,NN"LRQX^1BT+N5UB:S`IUKU"6("1(!9K=
-MJO!]_S91Z''94N)Q[!IN$!R*9P:WC7#<&MOHR;C8H*'`3;B)YQ%NXW\#3EQ2
-M9R-!S)QAT5F9MUBT'7A=G&>@!B@'HH.-8>"87SCKJU(9#+E[01^D[M8.5^+G
-M:81C5]P%C/MPN"B?*(57HK=)U369DT&G.^/&G>L@>.=Z',O;"*J^L]@*=%T\
-MN2X;NN<"#P\4`9 at M@CI\W10'U8(RH*2;EP)4!:6. at 0Q74M=\?YGFY_@;9]CA
-MJ&\&LZ=;S[C;+:H$5KN7J$\WC_0][`_KX^DPX(96-;Q8*!=T:2$B<5=C=Y]V
-M+X]3=3P-DD;1HTYGW/:LXRAZVQ at G1F>-Z5L@/9_H!AEF6Y7#23)9]=_<>IS*
-/7"KVP[OZ`WO*69D2"0``
+M'XL("'RF>54``VEM9RTV,W at R-34M-#`Y-BUP8SDX+G9H9&8N;W5T`*V4.V^#
+M,!#']WR*D[IE0'X#2R)%3>=*5=N94!-E:+MTZ,"'KP_;Q,:01V5,B.'PC_\]
+M?(38`T`P(,W,==G0[XIX]*OU:J#1[CZ at E-"DP%<#''`,]=4"6@%F-CF!=\.,
+M)H:^<,?6_7L<-<84Y%8M&D9<,>*<NR)S_!BY*.1^A:7.K+`:%,H2A`2IH&*W
+M*GS?OTT46ERVE%@<NX;S at EWQS."V`8X;8Q>\&18;M!2X=C?A/,!M[,_CQ"5U
+M)A)$SQD6G95YBZ4R(UX7YAFH!LJ!5,[&8N"87SCKJU,9+'+W at CY(W6T05\;O
+MTP#'KK at +,>Z`N""?40JO1&^3JFLS)X-.=\:-.Q<A\<ZU.):W$=1#9S$5B%T\
+MN2X;^N<B'A8H'#!;!+N#[<Z*@^I`:5`2YZ4`54-9A4`65U+??G_I]N?T&V88
+M<=0V@]D3US..NT65P!K\B/K`>:#O87]<GSZ/'N=;E?^P4!AT:2`B<;<[`!%G
+M=Y]V+X]3=3P-TGF5==/H#-N>>1)%;QOBQ.BLUEZF/Z.;R##;JA`GR635?W-K
+0<2ISJ2A"5G]F`B/D$@D`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-vtoc8.vhdf.gz
-M'XL("`?&'50``VEM9RTV,W at R-34M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME+UN
-MPR`4A?<\Q9&Z98C,C[$]1>I/MDJ5^@*U#409VDI5APY^^&*P8R#832-CA(C@
-M?)Q++C?+7`.X0$$A\KYSBIR!<S`*,#.3,%NBCN[PI=3]ZR-ESSO;NHV#$;-X
-MN7]0S2YTNZAUF^T`+`,=60:6R"ID-`ETN&I257_BEOPY7+U6N`[77(L39I20
-M"DI%N#</UZ[\9Y"+<!6(F[`;PB5CN&S:K'4_,CV'(Q-N'^.F<&FDHICT"7=(
-MNI-G7-."LU"U&.Q#"J=6316BK\7)&HW)$P+=SN/HHHG_IDHA2PO,S:XZ,<XO
-M="^[\'/`9@"NY9"40^43#$)#*%O\&`H.4:$H?2`-\@9=^_FAVN_3CW>#%M=7
-M/I.]R=[KJ:FEYI`"M.X/$;*?>_[NGH[;T_MQQ-$AJO%@4Z//I3E^$F48[L$4
-MYM@=BR_)5[DW:'PR'3X:__;V/HZ?@S4%2#?6YMB#'\%"*OLL+L\BU<UOP^+$
-/RJEB<F_S"YNC6FHN!P``
+M'XL("'^F>54``VEM9RTV,W at R-34M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME,EN
+MPR`0AN]YBI%ZRR%B,\:G2EURJU2I+U#;0)1#6ZGJ(0<>OBQV,`2[:62,$-8P
+M'__8,X-0&`",0TV`5VXR`A4%QH`2`&IW$NR1;(+9?ROU\/9$Z,O.#[,),&R-
+ME^<'KUF#V67#;+8#4"1^>!DH`#6`2!$8<$WT:O[$+>D+N':M<`.NNQ;'[2I!
+M*E`JP[U/</W*/P-?A*L`APV](5P\ADOC8:W=2O4<#D?<?8Z+X9+,BT#T+ZB#
+MHCIYQG4],)IZ+0;[6,*I55,%ZVMQLH7.Y at D&W<_CR**(_Z9*+84'5O946UCG
+M#>9UESX!V`W`M13B6 at CNS)P"U\"5;WX4:@:\@5I, at 23)&S#]UZ?J?XZGR1?T
+M.-?Y;/86I_,GMI?:2VH at K;N$2[>?Z+M[/FR/'X<11X:HQHMMCSZWYKPDK&#!
+M8[A[VY@]\A35T?PC3;U"#5J=5*=%8T;,6&XCCIV#5=+7+(XS>4D,I>SSN`IE
+57C?7AL?QE5-%(+3Y!5F3,44N!P``
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-apm.vhdf.gz
-M'XL("/;%'50``VEM9RTV,W at R-34M-3$R+6%P;2YV:&1F+F]U=`"M54UKPD`0
-MO?LK!GH3&I+=R<2>^D'U5I!*SQI,(H&JP0KM(3^^^ZF[211;=AV6#9-]OGEO
-M=Q+'>@!@"BF#6$1L at JOY_-P):*?OD1AQ9$<[TF#)M5V7X:+.:$=C#<AD.HT!
-MB]X^[@(F?J*=OW4!-9SDAPEDL0Q:`Z4W\7MNFL]R`(Z%*E?#\3Z[M%+K!"!C
-MD"'0 at YFI`BIEVK!;-OGA6!_K_6YIX5#`42$W9W]AM\V;079I8&_Q1F_1+)@!
-M]+T%RP]#GSU4=I`47A at A`AFD'!"!%8)X*G/BN0<X.Y3ER^+U_F.V</5##,R/
-M;M"/.?KI2^+J!RX_"JT?7=4OXY!E`V?SK-_7MSZ(EE]H_29&OS@?F"\GVGGD
-M_S0@&L!@#,ET9^+FKDL1N>T!$Q>0G>U5 at .O]KEP?ZQ_W!I/ISE4U''(_X_);
-M0!FP7+680JX=?G?3S;C>;BR<[7[VCX77)XN[59)?[DP8K"!79W:\+Q)UU!,\
-M>>45;MBMU/SH%HNG8LL*4-.TX3UX"0GWY)NAX53W<U_^K[<:C@(?%?&A'/T"
-(P78/5M('````
+M'XL("%>E>54``VEM9RTV,W at R-34M-3$R+6%P;2YV:&1F+F]U=`"M55UKPC`4
+M??=77-B;L)+FT[UL;$S?!C+9LY0VE<+4XH3MH?[WY=.F'XH;B9>0<IO3<\])
+MK at C9`4`9,`Q(!7)!).0IM,^]@&;^GJCQF/C13"Q8BJ[LN at R7]$8SF5I`K-,,
+M`2T&^T@(F'83S?*M#VCA-#^:@D`Z>`Z<W<3ON:X_Y0@<CE6NA2-#=JPT:V6&
+MP"`H\`<W\Q*XU&G';EUGAV-UK/:[M8>C"HX7>K/X"[MM5H^R8Y&]I3=Z2]T"
+M.\"NM^#YT=AGCQH[N!9>&:&"8F`$*`5<*.),Y]3S`'!QD/)E]7K_L5B%^E$:
+MF1^_03\<Z&<O2:@?A/QX;/WX5?T$`2%&SF:KW]>W/8B>7VS]9DX_E(W,EQ/-
+M,NG^+"!U at -$8BF)FNA\G[JYK$8GO`;,0$+?V&L!\OY/YL?H);["&TPZ7Y7CH
+M_9CH_P(N`&>FQ11Z'?"[FV^FU7;CX7SW\Q]67I\M[E<I"ICAMMR%,MA`GEIV
+M9"A2N\M^1_$D9:=PQ^YDYJ>P6'HN5DK#,8C^<YL8[<T:SG2_\.7_>FOA>.2C
+-HH[?Y!?6$J;]T@<`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-512-bsd.vhdf.gz
-M'XL("/?%'50``VEM9RTV,W at R-34M-3$R+6)S9"YV:&1F+F]U=`"ME#M/PS`0
-M@/?\BI/8.D1^QUUH55%F)"280W"J#L#"P.`?CR^)&U^>",5VHEAW]^4>]C'6
-M#@`E@)43[WF!/^5T^FR7-32!0%V`TJ`-V*#.^D4V1.!?SR]Y.GR'XTM6\[A\
-M,").K.&BP[*>PQT2G`S".M%D/+&J.$C7[]4$[CX\QQZGEKP+F6!N2C`;K-XJ
-M=[&V=F"7UAFX`RZ!V4XF*/!67^C]VX_=$"3<!?]@'&Z)N(+J\P0G5L(%BGM#
-M'"?*?0E7LG<<>U=M7`PYO!E_O+D(H3>WQ8EM&X%H.DLX at 4%K_)X7^*><SA:H
-M.N!F&;1=[S,23`W&@='X72 at P>RAL"A3T)/GJZ]-5W]>?M,*(XVTSF%QH+R3>
-M%E.`*/$GYAV_$__NSI?=]>,2<;%5Q1\K at TG7`:)&X5H:[N/I^6'HG1PGR9+L
-M<?0S;7LA<)*]0XI3MV"=:UH@[Q?9$,%DJT*<9 at .K_]:VQ9F-CTHX?-DO_`G/
-%>S`'````
+M'XL("%JE>54``VEM9RTV,W at R-34M-3$R+6)S9"YV:&1F+F]U=`"ME#MOPR`0
+M@'?_BI.Z9;!XXRR)%#6=*U5J9]?&48:V2X<.SG\O&!,?QH^J,L8(=-S'/>`(
+M\0U`,"#EQ#@O:$]Y_+79+NMHS`&E!B%!*BCL=C+T:!$)VK?S:XY;V^/HDM8\
+M+A^U@&-KN&`P;^9P1X3C5MB at G80BK8H"-_T"SQ'NX/^`$TO6V4 at 0,R68=59N
+M%;N0VV*DA_,,U`#E0(I>QF+@/;\PV+=/S6"1NPOV0>INZ7`ZWD\1CJVX"S'N
+MW>%0/J,4KD3OD%I7;9P,/GX9?WRY#A*_7(]CVQ8"UE46>P/MKG2<%[3/>?QY
+MH.B!FT50UT57JA0'U8`RH*2;:P%J#[K`0!;?I+;Z^C35]_4'9]CAJ"\&D]WI
+M,^Y>B]+`2G>(JMT<V?=PONRN'Y>`"Z4J'"R4"[JT$)&XJ^N^U'K<T^GEL4/>
+M!NMX&J1!RY]C[<1ESSK>6W?KQB-V5MR=-::S$?7Q>A!,EBJ'DV2D]=_<>IS:
+.^*H(0K)?SG[[SC`'````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-ebr.vhdf.gz
-M'XL("%/N+50``VEM9RTV,W at R-34M-3$R+65B<BYV:&1F+F]U=`"ME3MOPR`0
-M@/?\BI.Z98@``R9+(D5-YTI5V]EQ<92A[=*A at W]\.6,<SL9Y5!B,0`>?[\69
-M,?\`N#?9YP7M:O2TB^6BH_'#_4">!'I<C:<X;JL4CD6#2QP'7.W6-J'?UC7W
-M;&+<1VYSF_N`2D%538"O03^1.1RE1;$4P*K$."]H=RO:`M!T":-*D`J4!B-N
-MU?!]_Y:(KV$\E\$>)Z[A at L(^@U*X;80KG+")=OI,[$_%>1?/(]S&OP$G+VGG
-M/,%L2C!KK,J;+,8U>BZ.,W`+O`!F>IF at P"&^<-9O/55#$',OZ`=3<RO$E70_
-MCW#BBKE`<8>ALB1">,5[FZEV=>9@\/'-N/'F(H3>7(\3>0O!NJLL+@/=KNDX
-M+VB?5[1YH.R!V3QH^G^;+D`WH"UHA?-2 at EY#:6*@H)G4UM]?MOXY_<811ASW
-MQ2#9\;PH\+;H$D2%']$?.(_T>]@?EZ?/8\"%4A4^+#4Z73F(G)AKJ+E/NY?'
-ML7;%U$F&>(^CGG'9<X83[VUCG!R,M;8K@?S<R8((DJ4*<8J-3OTWMAZG,Z>*
--^^\N_@`\0K'N$`D`````
+M'XL("%JF>54``VEM9RTV,W at R-34M-3$R+65B<BYV:&1F+F]U=`"ME#UOPR`0
+MAO?\BI.Z98@``W:61(J:SI6JMK/MX"A#VJ5#!__XWH7@@,'YJ``;V3YX_!YW
+M'&.V`>"=O*8-_6+4^ME\=J+QYG$@3P(MKJ55G*;5BL:BHU<:!UR+[R:A;XT=
+MV\K'[7*[VST&5`KJ.@*^.WTB<SA*0V8I at -6)<=K0;Q9A=\#JE#"J!*E`::C$
+MO0H_MQ^)^%:,YW+8XL0MG!-L,RB%6WNX`HV=-]-FXGF5GW?^LX=;V=OAY#5U
+MN!/,I`R3SJJ\R5)A#]?Y<09N@!?`JK--A,`AOG#1MXQEB,#=*_H@=K<F7!G.
+MYQY.W'`70EPS5)9$"&_LWBI6UV8.!A^?C#M/+D'"DVMQ(F\A6)XJ"V8 at SHK'
+M:4/_N at B[!<HS,-L.=@TRT:P+T!UH`UK1<RE!+Z&L?*`(,ZEOO[],^W/X]2-,
+M.&Z+0?*B]:*@TZ)+$#7]1._HV=/WM-W/#\>]P[E2Y7XL-6VZ0HB,W.T:8/+B
+M[LOF[7FLKH at WZ;+*NHDZ_;*'7X+=6_LX.3AKC)/IKN`E,"1+%>$4&ZWZ;VPM
+03F=.%<W8[`\ABLN3$`D`````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 begin 644 img-63x255-512-gpt.vhdf.gz
-M'XL("/G%'50``VEM9RTV,W at R-34M-3$R+6=P="YV:&1F+F]U=`"METUOU#`0
-MAN_[*P9Q*R+8CNUD3XB*5N)6/GKCT'S8U4JP"(D#A_QX9NRDL;-VH,B)%7DU
-M\9-YQS.9+&/^`)`"6)>XY at W3=16?T^'JX&B\?QX0GT\N;(`5`CUN0",3=(\Q
-M8.T\&'>K_&(<-5OG#E>M!ZL"W!BNVHR\(<15'K?(M<\#*@5==P&\7_P3;CL4
-M2`WR"`+O9R`Y*`%*/N&<=C6$_MW<?H"[=Y^^$.SK*E=P-)H16`WZ"';<>,?S
-M<D\;N1Z'#E'TA4V*K;.X-]OH>5Q-N'$'EQIYG-Q;Y7/HW_;6XQ2+5[7AJE9!
-M*T`/,'99W+<(IPMGGB1SKZ$90!M0'`9+DU$#Y^@?EDGK(`($[OL1&@ZB)^!T
-M_EB=/>QU]?/5[)_D<T:D1MZ0BYX4>QE!3OU%+L2XNG3T6HJ>*A:]XYPLJ9$W
-M9*/7^>BE at T1.I4H7<7/4JA<QKB\</4UFK`]\?U]>\X;IKHI/#Y0SL)B'RMJA
-M8'40KF!U$*Y@=1"N:'40L&!U$*Y@=1"N8'40KFAU(-"P<DV<<"[W&K<!-?0F
-M=B/;CJ=E(Y9VN>#$7NO?:>+IS3`%FSCA=INX-5FQR[$16[")$ZYH$]?SY[?&
-MKS-77UK1O)'TL=:T(5"L.>.`PX^S&7Z=?H?1(QSW&9$<M%[4E)BZ`='10_1(
-M\\"_ES>/5Z?OCPM.S*J6!U-&8Q8C1%[(U;'<V^O/[QWR8?4N\9K2F^BAG[6-
-MA,_>/;CKVU"L?!)K+*!R)M<1_8@,R40FG$N5\.;_W5N/*YTJ^-?@\`>4./-P
-$LPT`````
+M'XL("%VF>54``VEM9RTV,W at R-34M-3$R+6=P="YV:&1F+F]U=`"MEDUOU#`0
+MAN_[*P8A<2BJ93NVX[TLHJ*5N!4HXL(EB9.J$BQ"XH#$]K\S8^?+V3C0RALK
+MRFKBQ^^,9S+F//P`E`1>K=S3AM,5BZ_3[F+G::)^&A#7)PD+($- at P#5HY)+>
+M:5OHNGYPX6>%R8V`HNV?!QR;?@<VP[EQUOE(&^8X%G"#N]W3@%I#59T!/P_Z
+MI-\.#<J`VH/$]SDH`5J"5B/.^ZZ;N;[KF_=P^_;C'<&^3NY*@<8"HZ?!&"CK
+MA3J1<E>R[D_L;L"A(,`-641[P!7)Z!V6T0NX`HUUNX%;&VF<VIH5<NC_]C;@
+M-(]GV?DLJ\%*,`VX*HG[%N%,YLQ39*YQ5QLP+6@!34</SH`0J`_+Q'J(!.F`
+M[Z$4(&L"GHX?V#'`+MG/U[T^)?J,6!MI0RIZ2FYE!(GZA[L0XXK<T;,4/9TM
+M>OL^6=9&VI",7A6BMQXD$K56NHCKH\9>Q+ at Z<_0,F;$^\/M]?D\;3K<LO@)0
+M]<!L"DM7MAFK at W`9JX-P&:N#<%FK at X`9JX-P&:N#<!FK at W!9JZ-T-IRI\C1Q
+MPE'N20/[&G0)MHEE)-OQZ17[$H0=YNY:+K=:_T837]T,RS,V<<)M-O&Z2SD[
+M<A;.9FSBA,O:Q!'HSWNF`./KRVAZ+A48+"D[!\HI9SRP^7%LFU\/OQ?1\^>]
+M\9"\&#1?%I28I at 19T2+&T?-,W\OK^XN'[_<#3O9>#0M31F,6(T2=N5LZ"N;H
+M[LW5IW<>^3BI6_E,3;/".JBSZ"+'>W6/_OYF[JP:G6T=.-2HIA']B0RI1`[G
+7O?G+S]W;@,N=*M at E=W\!E(LU`;,-````
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-mbr.vhdf.gz
-M'XL("%;N+50``VEM9RTV,W at R-34M-3$R+6UB<BYV:&1F+F]U=`"ME3UOPR`0
-MAO?\BI.Z9;```R9+(D5-YTI5V]EQ<)0A[=*A at W]\[XSM at +'S46$(PCIX\AYW
-MG!ES#X`4P,J)<=[0;+.P-8OEHJ7Q_6-`PX#Q")@AT.$JQ.$"E%DJ&O.:7FDD
-M`Z->X;OMYJY#@X1L at PV?=>;A#L.NN,\;6IS_7-RM'P,J!649`=][?>*JC,?U
-M%39Q?$V;,*H`J4!I,.)>A9^[CY%"A^.I''8X<0O7"W89-(7;>+@<C;6WTF5B
-MM\O/.W_NX=;NU^/D-75X$LQ.&6:=56F3Q6`+]_EQ!FZ!Y\!,9Q,A<(@O7/2M
-M8ADB</>*/HC=+0E7A.NYAQ,WW(40MQ\JRT0(;YS>.E97)0X&']^,.V\N0<*;
-MZW`B;2%8M94%,Q!7Q>.\H7G-PN:`L@,F.T'3?=MT#KH&;4$KFA<2]`H*XP-%
-MF$E-]?UEJY_3KQ]APG%7#"8[[1<YW19=@"CI3_2!YIZ^I]UQ>3H?>UQ?JOH_
-MEIH.72%$1NZ:T-V7[=OS6%T>'Y()3H^33K_LH>/!Z6U\G!R<M;8M@?S2 at Y?`
-<,%FJ"*?8:-=_8^MP.G&JX'=W\0?-HVE+$`D`````
+M'XL("&&F>54``VEM9RTV,W at R-34M-3$R+6UB<BYV:&1F+F]U=`"ME#UOPR`0
+MAO?\BI.Z9;```W:61(J:SI6JMK/MX"A#VJ5#!__XWAEC@['S4=D0A'/P^#WN
+M.,;L`R`%L&)BG#<T^R1LS6J]:FF\?`R8,V`\`B8(M+@*<;@`91:*QK2F5QK)
+MP*A7^&ZZN>W0("'98<-GFWBX8[\K[O.&%N<_@[OU8T"EH"@BX+O3)Z[*>%Q?
+M9A:.;]XFC,I`*E`:<G&OPL_#QTBAQ?&E'+8X<0OG!-L,FL+M/%R*QMI;:3.Q
+MV^7GG3_W<%O[<SAY31V>!#-3AEEGU;+)DF,+]_EQ!FZ`I\#RSB9"8!]?&/1M
+M8ADB</>*/HC=+0B7A>NYAQ,WW(405_:592*$-TYO&ZNK%@X&']^,.V\N0<*;
+M:W%BV4*P:2L+9B"NBL=Y0_.:A,T"90=<[`3K$IEHUBGH&K0!K6B>2=`;R'(?
+M*,),:JKO+U/]G'_]"!..VV(PV6F_2.FVZ`Q$01_11YI[^IX.I_7Y<G(X5ZK<
+MAZ6F0U<(D9&[=0E,#NZ^[-^>Q^K2^)"&7=9-U.F7/?PG.+V=CY.]L\8XF:X'
+>+X%ALE013K'1KO_&UN+TPJFB&5O]`=!K$S80"0``
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-pc98.vhdf.gz
-M'XL("%CN+50``VEM9RTV,W at R-34M-3$R+7!C.3 at N=FAD9BYO=70`K94[;X,P
-M$,?W?(J3NF5`?F.61(J:SI6JMC.E)LJ0=NG0 at 0]?&QOBPY!'94R(T>$?_WOX
-M(,0?`((!J6>NRX9N5^#1K=:KGD;;^X!20IT"7RVPQS&GKQ+0"+"SR0F\[6<T
-M,71%.+;A?\!1:TQ!8=6B8<05(RZX*S+'CY&+0NY76)K,"G6O4)8@)$@%FMVJ
-M\'W_-E'H<=E2XG'L&FX0'(IG!K>-<-P:V^C)N-B at H<!-N(GG$6[C?P-.7%)G
-M(T',G&'169FW6+0=>%V<9Z`&*`>B at XUAX)A?..NK4AD,N7M!'Z3NU at Y7XN=I
-MA&-7W`6,^W"X*)\HA5>BMTG5-9F30:<[X\:=ZR!XYWH<R]L(JKZSV`IT73RY
-M+ANZYP(/#Q0!F"V".GS=%`?5 at C*@I)N7`E0%I8Z!#%=2UWQ_F>;G^!MGV.&H
-M;P:SIUO/N-LMJ at 16NY>H3S>/]#WL#^OCZ3#@AE8UO%@H%W1I(2)Q5V-WGW8O
-MCU-U/`V21M&C3F?<]JSC*'K;&"=&9XWI6R`]G^@&&69;E<-),EGUW]QZG,I<
-.*O;#N_H#>\I9F1()````
+M'XL("&6F>54``VEM9RTV,W at R-34M-3$R+7!C.3 at N=FAD9BYO=70`K90[;X,P
+M$,?W?(J3NF5`?@-+(D5-YTI5VYE0$V5HNW3HP(>O#]O$QI!'94R(X?"/_SU\
+MA-@#0#`@S<QUV=#OBGCTJ_5JH-'N/J"4T*3`5P,<<`SUU0):`68V.8%WPXPF
+MAKYPQ];]>QPUQA3D5BT:1EPQXIR[(G/\&+DHY'Z%I<ZLL!H4RA*$!*F at 8K<J
+M?-^_311:7+:46!R[AO."7?',X+8!CAMC%[P9%ANT%+AV-^$\P&WLS^/$)74F
+M$D3/&1:=E7F+I3(C7A?F&:@&RH%4SL9BX)A?..NK4QDL<O>"/DC=;1!7QN_3
+M`,>NN`LQ[H"X()]1"J]$;Y.J:S,G at TYWQHT[%R'QSK4XEK<1U$-G,16(73RY
+M+AOZYR(>%B@<,%L$NX/MSHJ#ZD!I4!+GI0!50UF%0!974M]^?^GVY_0;9AAQ
+MU#:#V1/7,XZ[197`&OR(^L!YH.]A?UR?/H\>YUN5_[!0&'1I(")QMSL`$6=W
+MGW8OCU-U/`W2>95UT^@,VYYY$D5O&^+$Z*S67J8_HYO(,-NJ$"?)9-5_<VMQ
+/*G.I*$)6?V8"(^02"0``
 `
 end

Modified: head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu
==============================================================================
--- head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu	Thu Jun 11 15:18:54 2015	(r284270)
+++ head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu	Thu Jun 11 15:19:59 2015	(r284271)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-512-vtoc8.vhdf.gz
-M'XL("/[%'50``VEM9RTV,W at R-34M-3$R+79T;V,X+G9H9&8N;W5T`*V4O6[#
-M(!2%]SS%D;IEB,R/L3U%ZD^V2I7Z`K4-1!G:2E6'#G[X8K!C(-A-(V.$B.!\
-MG$LN-\M<`[A`02'ROG.*G(%S,`HP,Y,P6Z*.[O"EU/WK(V7/.]NZC8,1LWBY
-M?U#-+G2[J'6;[0`L`QU9!I;(*F0T"72X:E)5?^*6_#E<O5:X#M=<BQ-FE)`*
-M2D6X-P_7KOQGD(MP%8B;L!O")6.X;-JL=3\R/8<C$VX?XZ9P::2BF/0)=TBZ
-MDV=<TX*S4+48[$,*IU9-%:*OQ<D:C<D3`MW.X^BBB?^F2B%+"\S-KCHQSB]T
-M+[OP<\!F`*[ED)1#Y1,,0D,H6_P8"@Y1H2A](`WR!EW[^:':[]./=X,6UU<^
-MD[W)WNNIJ:7FD`*T[@\1LI][_NZ>CMO3^W'$T2&J\6!3H\^E.7X291CNP13F
-MV!V++\E7N3=H?#(=/AK_]O8^CI^#-05(-];FV(,?P4(J^RPNSR+5S6_#XL3*
-.J6)R;_,+FZ-::BX'````
+M'XL("&BF>54``VEM9RTV,W at R-34M-3$R+79T;V,X+G9H9&8N;W5T`*V4R6[#
+M(!"&[WF*D7K+(6(SQJ=*77*K5*DO4-M`E$-;J>HA!QZ^+'8P!+MI9(P0UC`?
+M_]@S at U`8`(Q#38!7;C("%07&@!(`:G<2[)%L at ME_*_7P]D3HR\X/LPDP;(V7
+MYP>O68/99<-LM at -0)'YX&2@`-8!($1AP3?1J_L0MZ0NX=JUP`ZZ[%L?M*D$J
+M4"K#O4]P_<H_`U^$JP"'#;TA7#R&2^-AK=U*]1P.1]Q]CHOADLR+0/0OJ(.B
+M.GG&=3TPFGHM!OM8PJE54P7K:W&RA<[F"0;=S^/(HHC_IDHMA0=6]E1;6.<-
+MYG67/@'8#<"U%.):".[,G`+7P)5O?A1J!KR!6DR!),D;,/W7I^I_CJ?)%_0X
+MU_EL]A:G\R>VE]I+:B"MNX1+MY_HNWL^;(\?AQ%'AJC&BVV//K?FO"2L8,%C
+MN'O;F#WR%-71_"--O4(-6IU4IT5C1LQ8;B..G8-5TM<LCC-Y20RE[/.X"F5>
+4-]>&Q_&54T4 at M/D%69,Q12X'````
 `
 end

More information about the svn-src-head mailing list