28 files changed, 310 insertions, 314 deletions

diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
index 754920fd0c7c..273dc480bbce 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-apm.vhdf.gz
-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@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@P.3WO`2X.639;/=Z]+%:A?H@C
-M\Y-7Z,<"_>PF"?6#D)\<6S]Y43_%0:F!WFST^_RRC>CYC:P?)4X_D@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('````
+M'XL(""X7AE4``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K55=:\(P%'WW
+M5US8RQ!6TN0FJ8\;T[=!F>Q9BFVE,+4X87OHCU_2)#;]4-Q(O(2&VQQ/SKFY
+M)<0,`.3`*1`5Q`9-]-RM!P'-\CU2XS%RHYD9L/C6KNMPT6`TL[D!I#K-"6`^
+MVL=\P+B?:-*W(:"!T_PP!DETB"T(?A>_Y[K^+";@:*CC&C@V9L?+]CD&D!0D
+M@EC8690@"IVV[#9U=CI7Y^IXV#@X5'`BUYOE7]CMLWJ2'0_L+=[I;>**T@+V
+MO07'#T/7'K9V""V\,D(%4N`,$('FBCC7.;4>`:Y.1?&R?GWZ6*U]_1`#\Q-W
+MZ$<]_<PE\?4#GY\(K9^XJ9]D(.5$;7;Z?7V;0G3\`NL7$ZL?R2;FZXDFC?H_
+M`X@6,!A#;KNS8/:N:Q&9ZP&)#T@[>UO`[?%0;,_5CW^#N>W.93D=>C]E^EL@
+M)-"L;3&Y?O;X/2QW\VJ_<W"N^[D_5EY?+!Z>DO>/NU(&MY!IQXZ-1>*^>@L!
+M!"&.>P>W[%)?/0.'E\,6:F8M31>]12\QV9LU7-O]_)?_ZZV!$X%+17TH9[]&
+'6*@@T@<`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
index 76af0f84edff..d5043499e754 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
@@ -1,14 +1,13 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-bsd.vhdf.gz
-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@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.@7"Y_:'#`'````
+M'XL("#$7AE4``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD9BYO=70`K90];X,P$(;W
+M_(J3NJ`,R-_`&C6=D2JU,Z4096B[=.C@'U\?8/!A(&F%L2R0?0_O??@8ZP>`
+M$L"JA75]PYY2^MC#\=#1!`)U!DJ#-I"[XVR:Y(-LV-?S2QH..^#XEM4Z+IT-
+MCQ.W<*-@?@].HA4G%)&/N+6-'I<,K&3"J2UU+A*L^9.S>J_8^=SF,[LPS\!;
+M8!J8]U)0X)A?F/05L0Q!W-W0![&[%>(R>IX'.''#7:"XM\W<;JM+8G7USLF0
+M\YMQY\U%"+VY/4[LVPA$UUE<!;I3\;J^8<N4/CU0#<#=(JB'WF<DF!9,`T;C
+M>Z;`%)#E(5#02K+UUV=3?U]_P@PC#A/2MLL3[87$VV(R$!7^Q+SC>Z#OX7PY
+M7C\N'N=;E?^Q,AAT[2`J<E=3=Y].SX\=LIS4R3A(.HQ>88`IX)PX/J@K:3DC
+H3HW.-FZ5G4P_R0?96&Q5B--L9O7?W/8XLW.IN.([_`(4]_T8,`<`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
index c46cfba27f30..dbd42befd234 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
@@ -1,15 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-ebr.vhdf.gz
-M'XL("+^;>54``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K94]<X,P#(;W
-M_`KENF7@;&$;9\TUG7O7Z\=*"*09VBX=.M#_7@OS86,@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@H\[+.9V6=TZ5%=$3H8<
-MKXPK5RY!_)5K<1AW(\!F9S$5:$:%]WE#_9CXIP6*%AAM!@4J36:5@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@PF^?6#%7VP9052-S*[YKUX!L*]C;<JPDDV\OIO;BU.12Z5G+'5'\M!HE._
-#"```
+M'XL("#47AE4``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K96Q;H,P$(;W
+M/,5%W3(@V_@,K%'3.5+5=B8$H@QMEPX=>/C:&(,/`TDJ@^,8G>_C/]_9,&8O
+M`/V;;<N&-IE<[6:WZ6C\]#"P:6:!%E=I+SU!MQ+[@6Z,>SC.0/!E?5L?=XX=
+M;O,8$!'*,@"^.7W">$D!K)SIEPWM/J'WH$\:(&8@$5!!+NX-^./P/I<.R6.M
+MG\6)6[A!,+\'EQHO;Z9?&<N&=BP3^^]P<DV=1K#ZH6`Q<NW)?.+GYQF8WB45
+ML+RW"0H<\@NCOB*4(4BX*_H@#+<TN(S.YQY.W`@7*.ZTFMMU==M0714Y&3C=
+M&7?N7`.A.]?B1-R#0'0GBZY`/2OLEPWM,:&W!<H>&&T%L?\4J114`ZH&A6:<
+M25`%9+D/%+22VNK[JZY^KK]^A@V.#U^.L!E_D9K=HC(0I7F).INQI^_I<-E=
+M/R\.YXXJ]V*IS**CAL@@7*3AONQ?GSOD<527AHN$_NH5"I@$SDG@O;HC+6?L
+HSGD7;*W[M)/I&GD@AMFCRN"03;S^FUN+4Y%+1=?>Y@]G9,(<OP@`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
index b84dcdd06a53..88c76f9f3d20 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
@@ -1,19 +1,19 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-gpt.vhdf.gz
-M'XL(",*;>54``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD9BYO=70`K98[;]M`#,=W
-M?PH:78H4%>ZMTQ(@1F.@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_@U):7KZ%KQ&H6>MFYEVR@DM"64)XB
-MN-L%SB2N/$7FRD!>@VE`<ZA;NC@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@Z)7S%QX'QUBLC^A6#6*;5H0EGS'%?P(#(1[OU)YUI7*_.;_W5N/2UTJ)6.[
-)OZ@^X(6S#0``
+M'XL("#D7AE4``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD9BYO=70`K9=-;]0P$(;O
+M^RL&<2@J(K(=V\E>D*AH$;>EA1N7?-A5#RQ"0HA#?CPS=M+863M2D1,KRFKB
+M)_-.9CQ>QOP!(`6P+G'-&Z:;*CZGP_7!T7C_,B"^GUS8`"L$>MR`1B;H&6/`
+MVGDP[F;YR3A$N]X[7+4>;ZH`-X:S-B-O"'&5QRUR[<N`2D'770"_+?X)]SD4
+M2`WR"`*?9R`Y*`%*/N.<=C6$_MW>?8;3A_NO!/N^RA4<C4,-7(!LB!)[Q_-R
+M/]W'<CT.':+HBR8IML[BKK;1\[B:<.,.+C7R.+DWBXF\V#1.L7A6&\ZJ#?0U
+MV`ZZ,8-[O\'IPIDGR=QK:`;0!A2'P=+-J(%S@!;+Q->$`($N'J'A('H"3N<O
+MU=G#WE6_WL[^23YG1&KD#;GH24H5UN;D-I3;NW(AQM6EH]=2]%2QZ!WG9$F-
+MO"$;O<Y'+QTDBEZJ=!$W1ZUZ%>/ZLM'CKFM@?>#Z?7G-&Z93%9\>*&=@,0^E
+MM4/!ZB!<P>H@7,'J(%S1ZB!@P>H@7,'J(%S!ZB!<T>I`H&'EFCCA*/<,@T:#
+M;6@#$;F1;<=3]0?W%71<17*-V&O].TT\_3%,P29.N-TF;DU6[')LQ!9LXH0K
+MVL35O/W6-6A77UK1?2-!8TFU(5"L.>.`P\^S&7X__0VCI]S*#.LF>3-HOJ@I
+M,3662$<OT2/=!_Z]OGV\?OKQN.#$K&IY,64T9C%"Y(5<%<N]NWGXZ)"GU;O$
+M,J7"Z!TU,$E+3"A\]NX4IXIR.Z!%K+&TR\6YSR/Z$1F2B4PXERKAP__[;3VN
+/=*K@7X/#/YI5K2*S#0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
index 04d78d5cef32..62cd24d4bed0 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-mbr.vhdf.gz
-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,.@KB-@AD"'*Q&'$]"LZ@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@9G.)T+@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@9E6IF]!3\"!^%>IT<5X12;1/VWM@ZG
-/$[>*96SU"XRD3B>_"```
+M'XL("#T7AE4``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD9BYO=70`K96Q;H,P$(9W
+MGN*B;AF0;7R&K%'3&:EJ.Q,"48:V2X<./'S/&(.-`TDJP\4Q.OOC/]_9,&8N
+M`"F`55?:94>W3_V[2[9)3^/'QX`%@[8-@"D!#:XF'`T@JW#HD#$.6CC]R#@#
+MP8>^,>C2Z=JD#NXTS@IMV>'B4H.SX;:/`1&AJ@+@F]4G8J=#:B#F(!%002'N
+M#?CC\#X+V.!XK/4S.'$+-PKF]^`R/<L9Z5;&LJ.;RL3\6YQ<4T<(UCP4+$:N
+M/5G,YKEY!D:[I`96##[A`\?\PJ1O%\H07K@K^B`,M]*XW!_/'9RX$2[XN.-J
+M;M?5;4)U=>1DX'QGW+ES-<3?N08GXAX$HC]9J`)I5-@N.[HR]6\#E`,PV@KB
+M\"E2&:@65`,*=3^7H':0%RY0^)74U=]?3?US^74SK'%\_'*$IN>+3.\6E8.H
+M]$O42?<=?4^'\_;R>;8X>U39%TNE%QT)(H-PT0_W9?_ZW"/+25T6+A*ZJ[=3
+MP"1P[@4^J"O]<L;^G+?!-M1FO4QKWH/GN'I4:1RRV:S_YM;@5.12H=I+_@`@
+'@2YHOP@`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
index 2cfff46e3587..1c96ba9724ce 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-pc98.vhdf.gz
-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@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=[,@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@OD_\NP52!XRV@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@3*-S'YX?[P`XUZFK8IQ2DRR_EO;%J<C;Y5<B-4?7X$:67`(````
+M'XL("$$7AE4``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5L6Z#,!"&
+M=Y[BHFX9D'W8!M:HZ8Q4M9TIA2A#VZ5#!QZ^MC'!AX$DE<&RC`Y__+_//A@;
+M+@"!P.J%?CW0'U)Z]\D^L33>W0>4$NH0^**!%H=&7RF@$:!'LP9=-S42Z-/9
+M->*X#H8@-VLUL(!S=D7D]4-K6.8@)$@%!=ZJ\.WXNF`8XQD><'@-=Q',;\%E
+M9I;WIE:+_();"PRXG6/M)IS84J<1K+W+K(R[61"+V3P_S\#T'FZ`%2Z&%'C)
+M+TSZRE`&$KL;^B"T6QM<3M_G'@ZOV`6*>]_,[;:Z7:BNB9R,;'XR;CRY!D)/
+M[H##N(5`V,JL=Z"ID4&_'NBKE-X#4#A@M!64[M^A,E`=J!:4-.-<@"HA+WP@
+MTIW4-]]?;?-S_O4S;'!\5M']9N9C9DZ+R@%K\Q'U8<:>OH?C:7_^/(VXL52-
+M'Q;*++K4$!'8E=3NT^'YT2*K25T6+I+T5Z]4P`1P3HP[=17=SM+F=S3;ZCZS
+A,L=&'DA@L509G&2S6?_-[8!3D;>*_JLE?_.D>A9P"```
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
index 098c281517a5..8b883164b87e 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-vtoc8.vhdf.gz
-M'XL(",R;>54``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$]/A#`0
-MQ>_[*9YZVP-IAU+@NM&]F9AX\2@+9=V#FA@/'O"[.Z6PT,+^B:$4`GG,K_/:
-MR0CA!J`T4H).[%2$)(92B!4+%5B?3C3;+V,VS_?J,7*C63F89'$V1)P3FB@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@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@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&````
+M'XL("$47AE4``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$UJPS`0
+MA?<YQ8-N0@I&_[:WI<VN$.@%ZL1RR*(ME"ZZT.$[BI38LE4W%"N*L!F_3_.D
+M81@+`U`&I8#1?BH!+:$4I*9`"XI/)]SVT]J'ET?]7(3A5@'&*9B5L+F`*T;#
+MK3816"4Z/@^LP&HPD04&7-VKZC]Q<_D%7+.4W8#;WXHSM+9H+:P=X5X'N,/"
+ME\$G=BWHPD5U$W`]MLN]W2`>WS#_#4<!MY[D%W"]73&0B`3'<]FA"/\4U_:X
+M:J*:,[O.9F<7+17>W8IK&^PMQ![23'#W)N*$5VGZOLFLOP?<KDA_H514!"Y6
+M>SHV*B-A.AA[[E42I8*I459#H$BN&>[P\6X/7Z?OX?GIV*BZ+C^]7E`3I$U*
+MB,9O8EK_/,CO[NFX.;T=+S@175TVII9Z[:1CESJUNZ4^>D;N^NSD])#T\/1J
+M`Z;`>6(\9K=+B\7CU-6LI56>T[S,Y"4)9&O/XS0;J?Y?RAYG%BX5JKW5#QL[
+&&6_=!@``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
index b793e814b161..48ef44ea0bdd 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-512-apm.vhdf.gz
-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@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@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]('````
+M'XL("!,7AE4``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"M55UKPC`4??=7
+M7-C+$%;2Y":ICQO3MT&9[%F*;:4PM3AA>^B/7](D-OU0W$B\A(;;'$_.N;DE
+MQ`P`Y,`I$!7$!DWTW*T'`<WR/5+C,7*CF1FP^-:NZW#18#2SN0&D.LT)8#[:
+MQWS`N)]HTK<AH('3_#`&272(+0A^%[_GNOXL)N!HJ.,:.#9FQ\OV.0:0%"2"
+M6-A9E"`*G;;L-G5V.E?GZGC8.#A4<"+7F^5?V.VS>I(=#^PMWNDMNJ*T@'UO
+MP?'#T+6'K1U""Z^,4($4.`-$H+DBSG5.K4>`JU-1O*Q?GSY6:U\_Q,#\Q!WZ
+M44\_<TE\_<#G)T+K)V[J)QE(.5&;G7Y?WZ80';_0^B56/Y)-S-<331KU?P80
+M+6`PAMQV9\'L7=<B,M<#$A^0=O:V@-OCH=B>JQ__!G/;G<MR.O1^RO2W0$B@
+M6=MB<OWL\7M8[N;5?N?@7/=S?ZR\OE@\/"7O'W>E#&XATXX=&XO$??460M=R
+M'/<.;MFEOGH&#B^'+=3,6IHN>HM>8K(W:[BV^_DO_]=;`R<"EXKZ4,Y^`<JL
+&"UG2!P``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
index 203face2a72c..ed4be0e25e1c 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
@@ -1,14 +1,13 @@
 # $FreeBSD$
 begin 644 img-1x1-512-bsd.vhdf.gz
-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@34*2@-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@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@M1E[_K6V+,RLOE5R(
-*Z!<+G]H<,`<`````
+M'XL("!87AE4``VEM9RTQ>#$M-3$R+6)S9"YV:&1F+F]U=`"ME#UO@S`0AO?\
+MBI.ZH`S(W\`:-9V1*K4SI1!E:+MTZ.`?7Q]@\&$@:86Q+)!]#^]]^!CK!X`2
+MP*J%=7W#GE+ZV,/QT-$$`G4&2H,VD+OC;)KD@VS8U_-+&@X[X/B6U3HNG0V/
+M$[=PHV!^#TZB%2<4D8^XM8T>EPRL9,*I+74N$JSYD[-ZK]CYW.8SNS#/P%M@
+M&ICW4E#@F%^8]!6Q#$'<W=`'L;L5XC)ZG@<X<<-=H+BWS=QNJTMB=?7.R9#S
+MFW'GS44(O;D]3NS;"$3765P%NE/QNKYARY0^/5`-P-TBJ(?>9R28%DP#1N-[
+MIL`4D.4A4-!*LO779U-_7W_"#",.$]*VRQ/MA<3;8C(0%?[$O.-[H._A?#E>
+M/RX>YUN5_[$R&'3M("IR5U-WGT[/CQVRG-3).$@ZC%YA@"G@G#@^J"MI.2-.
+GC<XV;I6=3#_)!]E8;%6(TVQF]=_<]CBS<ZFXXCO\`A3W_1@P!P``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
index 45c1d9b8ff32..a4c9a85a934f 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
@@ -1,15 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-512-ebr.vhdf.gz
-M'XL("*J;>54``VEM9RTQ>#$M-3$R+65B<BYV:&1F+F]U=`"ME3US@S`,AO?\
-M"N6Z9>!L81MGS36=>]?KQTH(I!G:+ATZT/]>"_-A8R!)SV#`G*R'5Y9L&+,'
-M@+DFV[RA3D9'O=JL&AH_W`RLJDF@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@9N?:$'OFY>09F5DD!
-M3+<V](%]?F'0MPUEH!?N@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[\(
-"````
+M'XL("!L7AE4``VEM9RTQ>#$M-3$R+65B<BYV:&1F+F]U=`"ME;%N@S`0AO<\
+MQ47=,B#;^`RL4=,Y4M5V)@2B#&V7#AUX^-H8@P\#22J#XQB=[^,_W]DP9B\`
+M_9MMRX8VF5SM9K?I:/ST,+!I9H$65VDO/4&W$ON!;HQ[.,Y`\&5]6Q]WCAUN
+M\Q@0$<HR`+XY?<)X20&LG.F7#>T^H?>@3QH@9B`14$$N[@WXX_`^EP[)8ZV?
+MQ8E;N$$POP>7&B]OIE\9RX9V+!/[[W!R39U&L/JA8#%R[<E\XN?G&9C>)16P
+MO+<)"ASR"Z.^(I0A2+@K^B`,MS2XC,[G'D[<"!<H[K2:VW5UVU!=%3D9.-T9
+M=^Y<`Z$[U^)$W(-`=">+KD`]*^R7#>TQH;<%RAX8;06Q_Q2I%%0#J@:%9IQ)
+M4`5DN0\4M)+:ZONKKGZNOWZ&#8X/7XZP&7^1FMVB,A"E>8DZF[&G[^EPV5T_
+M+P[GCBKW8JG,HJ.&R"!<I.&^[%^?.^1Q5)>&BX3^ZA4*F`3.2>"]NB,M9^S.
+G>1=LK?NTD^D:>2"&V:/*X)!-O/Z;6XM3D4M%U][F#V=DPAR_"```
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
index 5990d3cbe1ff..025252d30e29 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
@@ -1,19 +1,19 @@
 # $FreeBSD$
 begin 644 img-1x1-512-gpt.vhdf.gz
-M'XL("*V;>54``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"ME4N/U#`,@._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@8;$6H!V
-M]:45K4L)VI:460)QSAD';'Z<NN;7X^]5]$Q(E<U)^B@H,74)6-%'=$OKA7U7
-M-P_7C]\?1AP&K\8/4T;;++80>>:N%6@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"\+,-````
+M'XL("!X7AE4``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"ME\%NVS`,0._Y
+M"@X[=&A10Z(EV3ZN6`OLEJTM=MG%D>6BP)9AP`X[Y.,G2G(C)9*W#K()0P'-
+M9Y(B38<Q?P`(!#9FKF7%X:9)S\/F<N-H?/<ZH'T^N7`";"S0X[15,J1[C(%Y
+M#L*XL_+&5K`_KAVN.1[OF@@WQ58G4E;$N,;CEG#GUP&EA'$\`SXN_J';#@E"
+M@1@`[?T,!`>)(,4+SL4N=>S?[=U'V+[__$"PK\=PD5OEK&&8P'2$2+WC*^$^
+MI.%Z'!)N!NRRP;9%W,5I]CRN)=RT@LM)&2?6K'P-_=O>>IQDJ54?6_42>@2E
+M81J+N&\)3E6N/$'JG8).@S(@.>B9%I,"SJU_MDU\3R#@!&R`C@/N"'C8?VKV
+M'G;=_+P*_@D>*B(G944I>P+7*H*<^DNXD.+:VMGK*7NR6O:&4"PY*2N*V1M]
+M]O))(J=RK6MQ(6O-FQ2WJYP]16K;'_;]?7XM*P[;)CT]4`1@-0_%/.N*W4&X
+MBMU!N(K=0;BJW4'`BMU!N(K=0;B*W4&XJMUA@8;5&^*$H]J;;,X'D':(IU53
+M'L?6OR_WSK&+)%R#:Z-_98CG-\-4'.*$6QWBLRD'&XZ38"L.<<)5'>(R?'ZK
+M%I3K+R5IW0E0MJ7Z&(C'FG%`_6-O]*_GWW'V",=]162%[+&EPE0=X$@/41.M
+M(__>WCY=/G]_6G`8HEH>3!6-5()"G(4KTW#O;NX_..3VZ%WF-27C[`T*F*!7
+M3!QX\&Z;EHIT7T!+L&8&W9+MBR0_$D6VD`GG2B6^^7_WUN-JEXK]:[#Y`[$*
+&K32S#0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
index fcecea27c13a..c93aec151c4c 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-1x1-512-mbr.vhdf.gz
-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@WJ\GB1
-MQBB\BP,P"9P'B7?J$)/]A,G*(=FJ!F5:F;T%/P('X5ZG1Q7A%)M$_;>V#J<3
-.MXIE;/4+C*1.)[\(````
+M'XL(""(7AE4``VEM9RTQ>#$M-3$R+6UB<BYV:&1F+F]U=`"ME;%N@S`0AG>>
+MXJ)N&9!M?(:L4=,9J6H[$P)1AK9+APX\?,\8@XT#22K#Q3$Z^^,_W]DP9BX`
+M*8!55]IE1[=/_;M+MDE/X\?'@`6#M@V`*0$-KB8<#2"K<.B0,0Y:./W(.`/!
+MA[XQZ-+IVJ0.[C3."FW9X>)2@[/AMH\!$:&J`N";U2=BIT-J(.8@$5!!(>X-
+M^./P/@O8X'BL]3,X<0LW"N;WX#(]RQGI5L:RHYO*Q/Q;G%Q31PC6/!0L1JX]
+M6<SFN7D&1KND!E8,/N$#Q_S"I&\7RA!>N"OZ(`RWTKC<'\\=G+@1+OBXXVIN
+MU]5M0G5UY&3@?&?<N7,UQ-^Y!B?B'@2B/UFH`FE4V"X[NC+U;P.4`S#:"N+P
+M*5(9J!94`PIU/Y>@=I`7+E#XE=35WU]-_7/Y=3.L<7S\<H2FYXM,[Q:5@ZCT
+M2]1)]QU]3X?S]O)YMCA[5-D72Z47'0DB@W#1#_=E__K<(\M)718N$KJKMU/`
+M)'#N!3ZH*_URQOZ<M\$VU&:]3&O>@^>X>E1I'++9K/_FUN!4Y%*AVDO^`""!
+&+FB_"```
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
index f54ce7fda2e6..b234c5ecb37c 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-512-pc98.vhdf.gz
-M'XL("+2;>54``VEM9RTQ>#$M-3$R+7!C.3@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@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@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<`@`````
+M'XL(""<7AE4``VEM9RTQ>#$M-3$R+7!C.3@N=FAD9BYO=70`K96Q;H,P$(9W
+MGN*B;AF0?=@&UJCIC%2UG2F%*$/;I4,''KZV,<&'@225P;*,#G_\O\\^&!LN
+M`('`ZH5^/=`?4GKWR3ZQ--[=!Y02ZA#XHH$6AT9?*:`1H$>S!ETW-1+HT]DU
+MXK@.AB`W:S6P@'-V1>3U0VM8YB`D2`4%WJKP[?BZ8!CC&1YP>`UW$<QOP65F
+MEO>F5HO\@EL+#+B=8^TFG-A2IQ&LO<NLC+M9$(O9/#_/P/0>;H`5+H84>,DO
+M3/K*4`82NQOZ(+1;&UQ.W^<>#J_8!8I[W\SMMKI=J*Z)G(QL?C)N/+D&0D_N
+M@,.XA4#8RJQWH*F10;\>Z*N4W@-0.&"T%93NWZ$R4!VH%I0TXUR`*B$O?"#2
+MG=0WWU]M\W/^]3-L<'Q6T?UFYF-F3HO*`6OS$?5AQIZ^A^-I?_X\C;BQ5(T?
+M%LHLNM00$=B5U.[3X?G1(JM)718NDO17KU3`!'!.C#MU%=W.TN9W--OJ/K,R
+@QT8>2&"Q5!F<9+-9_\WM@%.1MXK^JR5_\Z1Z%G`(````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
index 63b7b65abbe9..bc89e34ee4ca 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-512-vtoc8.vhdf.gz
-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@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@3X%Y'N'+A
-MPY`3NP9\X"3;8KD$O%&!76GMNN#PA.4I'`O-`/)Q@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@I6>\RXXQT:]O5AW-FAI)UJ;93^_#$RSN):P]BTM$$/7_4K8X
-0O7"I%$*L_@!4PT87W08`````
+M'XL(""H7AE4``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V436K#,!"%
+M]SG%@VY""D;_MK>ES:X0Z`7JQ'+(HBV4+KK0X3N*E-BR53<4*XJP&;]/\Z1A
+M&`L#4`:E@-%^*@$MH12DID`+BD\GW/;3VH>71_U<A.%6`<8IF)6PN8`K1L.M
+M-A%8)3H^#ZS`:C"1!09<W:OJ/W%S^05<LY3=@-O?BC.TMF@MK!WA7@>XP\*7
+MP2=V+>C"1743<#VVR[W=(![?,/\-1P&WGN07<+U=,9"(!,=SV:$(_Q37]KAJ
+MHIHSN\YF9Q<M%=[=BFL;["W$'M),</<FXH17:?J^R:R_!]RN2'^A5%0$+E9[
+M.C8J(V$Z&'ON51*E@JE15D.@2*X9[O#Q;@]?I^_A^>G8J+HN/[U>4!.D34J(
+MQF]B6O\\R._NZ;@YO1TO.!%=73:FEGKMI&.7.K6[I3YZ1N[Z[.3TD/3P]&H#
+MIL!Y8CQFMTN+Q>/4U:RE59[3O,SD)0ED:\_C-!NI_E_*'F<6+A6JO=4/&SL9
+%;]T&````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
index 24ca4e715c6d..6892f0a9e061 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-apm.vhdf.gz
-M'XL("&NF>54``VEM9RTV,W@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@.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@-(:BF)GNQXF[ZUI$XGO`+`3$K;T&,-_O9'ZL?L(;K.&TPV4Y
-M'GH_)OJ_@`O`F6DQA5X'_.[FFVFUW7@XW_W\AY779XO[58H"9K@M=Z$,-I"G
-MEAT9BM3NLM]1/$G9*=RQ.YGY*2R6GHN5TG`,HO_<)D9[LX8SW2]\^;_>6C@>
-/^:BH9CKY!5KF!832!P``
+M'XL("&87AE4``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD9BYO=70`K57+:L,P
+M$+SG*Q9Z"]3(>KJG/FAR*X2&GH.)[6!H$I,&VH,_OEI+2B3;"6F1O`B)M<:C
+M&6E-B&D`7("@0'00&[SKS_->0#M[3W1[2EQK)P8LO;;J,ES2:^UD:@`IIH4F
+M5`S6,1\P#1/MXJT/:."0'T]!$0RY!BENXO?<-)_E"!R-M5T#QX;L1-6-4P!%
+M07&0#[:7%<@2TY;=JLD/Q_I8[W<K!Z==!%G@8O47=MN\&64G(GO+;_0VLP-J
+M`4-OP?'CL<\>[^R0*+PV0@>G(!AP#K30Q`7F]'P`.#^4Y<OR]?YCOO3UXSPR
+M/WF#?M33SUP27S_P^<G8^LFK^BD&2HV<S;-^7]_F(#I^D?5+B=6/Y"/]Y42[
+M2,+'`'(+&(UA9JNS9/:NHXC,U8#,!Z1G>SO`]7Y7KH_UCW^#,UN=JVH\<#UE
+M^"^0"FC>E9@"QQZ_N]EF6F\W#LY5/_=A[?7)XOXNLW"[<VUPGQT;BI0%ZJ7(
+MDU7!Q@/U'GTX?MIL66*/-%T$DR`Q6IL1KJM^_LO_]=;`R<A'1?\H)[_[9GW/
+$T@<`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
index 5b0921624fda..7bd9f318288d 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-bsd.vhdf.gz
-M'XL("&VF>54``VEM9RTV,W@R-34M-#`Y-BUB<V0N=FAD9BYO=70`K90[;\,@
-M$(!W_XJ3NF6P>.,LB10UG2M5:F?7QE&&MDN'#LY_+Q@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@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@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``
+M'XL("&D7AE4``VEM9RTV,W@R-34M-#`Y-BUB<V0N=FAD9BYO=70`K90[3\,P
+M$(#W_(J3V#I$?L==:%519B0DF$-PJ@[`PL#@'X\OB1M?G@C%=J)8=_?E'O8Q
+MU@X`)8"5$^]Y@3_E=/ILES4T@4!=@-*@#=B@SOI%-D3@7\\O>3I\A^-+5O.X
+M?#`B3JSAHL.RGL,=$IP,PCK19#RQJCA(U^_5!.X^/,<>IY:\"YE@;DHP&ZS>
+M*G>QMG9@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@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``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
index 8048b55da79b..04e8499dc36f 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-ebr.vhdf.gz
-M'XL("'&F>54``VEM9RTV,W@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@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`)````
+M'XL("&X7AE4``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD9BYO=70`K94[;\,@
+M$(#W_(J3NF6(``-V%D>*FLZ5JK:SX^`H0]NE0P?_^-Z9X`+&>52`C;`//M^+
+M,V.V`>"=O.8%_2IJ_6*Y&&A\?S^0)X$6U](N3LL:16/1T2.-(Z[%9Y/0;X,=
+M6^WC#KG-[>X#*@5-,P&^.OU$YG"4AL12`&L2X[R@WZ["[H#5D#"J!*E`::C$
+MK1J^[]X2\:T8SV6PQ8EK.*>PS:`4;N/A"A1VWDJ;B>==?M[Y<P]7V]OAY"7M
+MT!/,I`2SQJJ\R5)A#_?Y<09N@!?`JK-,A,`QOO"GWWJJA@C,O:`?3,UM"%>&
+MZ[F'$U?,A1"W'RM+(H17O%=/M6LS!X/')^/&DTN0\.1:G,A;"-9#9<$,Q%73
+M<5[0/Z_";H'R#,SE0>[^;;H`W8$VH!7-2PEZ#67E`T6827W[]6G:[]./%^$!
+MQVTQ2%ZT7Q1T6G0)HJ&/Z`/-/?T>=L?EZ>/H<*Y4N0]+34Y7")&1N3PV]VG[
+M\AAK5\1.XI'W!.GIESU\$WAOX^/D:*S!L1UP[@H>`D&J5`TXQ:)=_XVMQ>G,
+.J8+_W<4O_(N/<A`)````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
index ce2279b0f490..6cc070dd59a5 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
@@ -1,19 +1,19 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-gpt.vhdf.gz
-M'XL("'2F>54``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD9BYO=70`K99-;]P@
-M$(;O^RNFZBU5$6#`[&6K1$VDWM*O6R^VL:,<LE6E'GK8_/?.@+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_@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@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@SJK(7%\5!?.HQ]B9]79V=Z!0XUJ'LF?Q)!+Y'#>BU_^W[T-
-0N-*I@N>]W5^),'<SLPT`````
+M'XL("'(7AE4``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD9BYO=70`K9=-C]L@
+M$(;O^153];95$6#`Y-*TJ^Y*O6V_;KW8V%[MH:FJ]M!#?GQGP%F#`U93$2/+
+MT9C',\,[C,UY^`$H";S+G,N&TRU+C]/N9N=IHK\.B,\G%U9`AL"`<VCDDNX9
+M1YBF>7#A9X7).!1?KCV.+;^W+,(-\:S5*!MB'`NX<[C3=4"MH>LN@%_/_DF_
+M'!J4`;4'B?=C;`*T!*V><3YV[6+_[NX_P,.[3U\(]FT)5PHT]@)Z`YV&MEEY
+M)S;"_96&&W#H$&6_F;+!-D7<89V]@&L(-VS@<J.,4UNS@H;^;6T#3O-TEHUG
+M-2/T#4P==$,!]V:%,Y65I\B,"]LZ,"-H`6ZBB\&`$``6R\1ZB`2)+NZA%2![
+M`IZ.']DQP%ZSGZ]F_Y28%9$;94,I>XJDPFTIW):TO1DNI+BF=O8L94]7R]Y^
+M%DMNE`W%['4A>_DD4?9RI8NX.6OL18KKZV9/^*Z!]8'[]^6Y;#@]L/0(0#4#
+MJWG83I.K6!V$JU@=A*M8'82K6AT$K%@=A*M8'82K6!V$JUH="!QYO29..-*>
+MVX/#G/?0IZHIM^/%OT,2[BBW6O]&$\\OQEBQB1-NLXE/X[7!5FSBA*O:Q.W\
+M^FT:,+Z^C*;K5H'!DK(Q4"Z:\4#WXSBZWT]_XNQ9OS/#\I*\&C1?-B1,@R72
+MT4/,0->1?R_O'F^>OC^><7*.ZOQ@4C2J&"'J(ER;AGM_^_G]VKO,-F63[(D+
+M.:^V@4.,4\_!XJ<![E!<+2/YDQBR0B:<ETI\\_^N;<#5E@I^&NS^`F]3<4FS
+##0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
index 209001e00ac1..9efe743cce4f 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-mbr.vhdf.gz
-M'XL("'BF>54``VEM9RTV,W@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@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@KHK'>4/SFH3-`F4'7.P$ZQ*9:-8IZ!JT`:UHGDG0&\AR
-M'RC"3&JJ[R]3_9Q__0@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`````
+M'XL("'<7AE4``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD9BYO=70`K94];\,@
+M$(;W_(J3NF6P``-VED2*FLZ5JK:SX^`H0]JE0P?_^!Y@'#[L?%0`03@'C]_C
+M#DR(+0"<`6DF^GE#ORW"VB^6"T.C^\>`-0%"$V"!0(MK$8<34&8C=%]V^E'W
+MVD!T:_%9#6/;H$="L<&*95UXN,.X*FWS!H/SR\7=[C&@$-`T"?#=Z6-793RN
+MKU*9XUN;A!$5<`%"0LWN5?BY^X@46AS-Y;#%L5LX)]AFT!1NX^%*-';>3)N)
+MPRH_[_RQAUO;G\/Q:^IP)XB:,LPZ*_(F2XTU7.?'&:@"6@*I!QL+@6-\X:)O
+ME<I@@;M7]$'J;J-Q53B?>CAVPUT(<?OQ9ID(X8W=6Z?JVLS!H/')N//D:DAX
+M<BV.Y;T(5N9FP0S$66D_;^A?B[!:(!^`N7:0NF^;+$%V(!5(H<<5![F"JO:!
+M+,RDOOW^4NW/Z=>+L,%1>QE,-KV>E?JTR`I8HU\B#WKLZ7O:'9>G\]'AW%7E
+M7LREWG2!$!ZY2V-W7[9OS[&Z,MXD&NT>TSK]:P__"79OX^/XZ*S"OC4XUX*'
+=P#!U51F<(-&J_\;6XF3F5,'O[N(/#6I7UQ`)````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
index 2bc05e16ec10..1cd1b69fdb0c 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-pc98.vhdf.gz
-M'XL("'RF>54``VEM9RTV,W@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@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@EWQS."V`8X;8Q>\&18;M!2X=C?A/,!M[,_CQ"5U
-M)A)$SQD6G95YBZ4R(UX7YAFH!LJ!5,[&8N"87SCKJU,9+'+W@CY(W6T05\;O
-MTP#'KK@+,>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`````
+M'XL("'T7AE4``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5.V^#
+M,!#']WR*D[IE0'X#2Y"BIG.EJNU,J8DRM%TZ=.##UT_J!^11&1/'</C'_^[L
+M`R%[`#`"J%_HUPW3OHK;M-EN#`V/MP$YASX'/BN@P1&MKV4P,%"CY`0ZFA'.
+M#%/ECL[]>QQ6QASD9JT:9EPUXYR[K'#\"#HKY':%M2RLL#$*>0V,`Q?0D&L5
+MOAY>$H465RPE%D<NX;Q@MW@6<%V`H\HX!D^&BPT&#%2ZBW`<X';VYW'LG#H5
+M"227#*O.\K*+I5$MGA?F&;`$3`$USD9BX)Q?^-/7YC)(Y.X9?9"[VVM<'3^/
+M`QRYX"[$N#>-"_(9I?!"]':YNJ%P,G"Z,Z[<N1H2[UR+(V4+06LJBUJ!NHIG
+M_;IA>JSB9H',`4M%$/NOFZ`@1A`2!-?CFH%HH6Y"((E7TC1\?<KA^_039-C@
+ML"T&BZ>>3ZC>+:(&TNN7B'<]#O3='8[;T\?1XWRI\B]F0@>=*PA+W,6INP_[
+MI_M4'4V#A)/H$:TS+'OJ3A2]+L2QV5FI^L'@_!E=1(:E4F5P'"6S_IM;BQ.%
+/EXKZ\&Y^`;L#9P42"0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
index 433c602a5fa5..adb8aef9a0ba 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-vtoc8.vhdf.gz
-M'XL("'^F>54``VEM9RTV,W@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@D&W<_CR**(_Z9*+84'5O946UCG
-M#>9UESX!V`W`M13B6@CNS)P"U\"5;WX4:@:\@5I,@23)&S#]UZ?J?XZGR1?T
-M.-?Y;/86I_,GMI?:2VH@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``
+M'XL("($7AE4``VEM9RTV,W@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``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
index ebcf7367924c..7a293bcbd0eb 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-apm.vhdf.gz
-M'XL("%>E>54``VEM9RTV,W@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@C9`4`9,`Q(!7)!).0IM,^]@&;^GJCQF/C13"Q8BJ[LN@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@-$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@<`````
+M'XL("$@7AE4``VEM9RTV,W@R-34M-3$R+6%P;2YV:&1F+F]U=`"M55UKPR`4
+M?>^ON+"WPD*B5\V>]L':MT%9V7,)C2F!M0U=87O(CY]&;35)2S<T%U%N/#F>
+MHS=I:AH`,F`$4A6I#>SZ\[P7T,[>$]6>$M?:B0'+KJVZ#)?T6CN9&D"BTTP1
+M*@?KJ`^8A8EV\=8'-'":'V8@4AU\#9S=Q.^Y:3[E"!R)M5T#1X?L6-6-,P!!
+M0"#P!]OS"KC4:<MNU12'8WVL][N5@U,N`B_U8O$7=MNB&67'(GN+-WJ+=D`L
+M8.@M.'X8^^QA9P?7PBLC5"`!1@$12*F(,YU3\P'@_"#ER_+U_F.^]/5#C,R/
+MWZ`?\?0SE\37#WQ^/+9^_*I^@H(0(V?SK-_7MSF(CE]L_7*K7UJ,])<3[2()
+M'P.(%C`:P]Q69T[M7=<B4E<#<A^0G.WM`-?[G5P?ZQ__!N>V.E?5>.CUA.I_
+M`1=`BJ[$E'KL\;N;;:;U=N/@7/5S'U9>GRSN[S(/MSM7!O?9T:%(>:!>IGG2
+M*MAXH-ZC#X>GS4JI>TW313`)$J.U6<-UU<]_^;_>&C@>^:BH'^7D%W>2WK;2
+#!P``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
index 9df781c6d3d4..2d08e91eea3c 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-512-bsd.vhdf.gz
-M'XL("%JE>54``VEM9RTV,W@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@G80BK8H"-_T"SQ'NX/^`$TO6V4@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`'````
+M'XL("$L7AE4``VEM9RTV,W@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@4%K_)X7^*><SA:H
+M.N!F&;1=[S,23`W&@='X72@P>RAL"A3T)/GJZ]-5W]>?M,*(XVTSF%QH+R3>
+M%E.`*/$GYAV_$__NSI?=]>,2<;%5Q1\K@TG7`:)&X5H:[N/I^6'HG1PGR9+L
+M<?0S;7LA<)*]0XI3MV"=:UH@[Q?9$,%DJT*<9@.K_]:VQ9F-CTHX?-DO_`G/
+%>S`'````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
index 0a93429207fc..2e2f8c518db8 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-ebr.vhdf.gz
-M'XL("%JF>54``VEM9RTV,W@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@-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@SHK'
-M:4/_N@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@WZ;+*NHDZ_;*'7X+=6_LX.3AKC)/IKN`E,"1+%>$4&ZWZ;VPM
-03F=.%<W8[`\ABLN3$`D`````
+M'XL("%`7AE4``VEM9RTV,W@R-34M-3$R+65B<BYV:&1F+F]U=`"ME3MOPR`0
+M@/?\BI.Z98@``W861XJ:SI6JMK/CX"A#VZ5#!__XWIG@`L9Y5("-L`\^WXLS
+M8[8!X)V\Y@7]*FK]8KD8:'Q_/Y`G@1;7TBY.RQI%8]'1(XTCKL5GD]!O@QU;
+M[>,.N<WM[@,J!4TS`;XZ_43F<)2&Q%(`:Q+CO*#?KL+N@-60,*H$J4!IJ,2M
+M&K[OWA+QK1C/9;#%B6LXI[#-H!1NX^$*%';>2IN)YUU^WOES#U?;V^'D)>W0
+M$\RD!+/&JKS)4F$/]_EQ!FZ`%\"JLTR$P#&^\*??>JJ&",R]H!],S6T(5X;K
+MN8<35\R%$+<?*TLBA%>\5T^U:S,'@\<GX\:32Y#PY%J<R%L(UD-EP0S$5=-Q
+M7M`_K\)N@?(,S.5![OYMN@#=@3:@%<U+"7H-9>4#19A)??OU:=KOTX\7X0''
+M;3%(7K1?%'1:=`FBH8_H`\T]_1YVQ^7IX^APKE2Y#TM-3E<(D9&Y/#;W:?OR
+M&&M7Q$[BD?<$Z>F7/7P3>&_CX^1HK,&Q'7#N"AX"0:I4#3C%HEW_C:W%Z<RI
+-@O_=Q2_\BX]R$`D`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
index 9aebe7919fe7..73c7cbb715e8 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
@@ -1,19 +1,19 @@
 # $FreeBSD$
 begin 644 img-63x255-512-gpt.vhdf.gz
-M'XL("%VF>54``VEM9RTV,W@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+($-@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+@Z<_0,F;$^\/M]?D\;3K<LO@)0
-M]<!L"DM7MAFK@W`9JX-P&:N#<%FK@X`9JX-P&:N#<!FK@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@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@E=W\!E(LU`;,-````
+M'XL("%07AE4``VEM9RTV,W@R-34M-3$R+6=P="YV:&1F+F]U=`"METN/U#`,
+M@._S*XRX+2)*TB1-3P,K=A&WY77CTD>Z6@D&(8'$H3\>NVEWDDY26)36JC)R
+M\M5V['C*N;\`E`3>)IYYQ73-XGLZ7!UFFNB>!L3WDPD;($.@Q_6HY)+F.`?C
+MN`@7\RJ_&$7Q\WC&L?/UB@6X(5RUD;PBQ#&/6]T=GP;4&MKV`OAYM4_.VZ%!
+M&5`-2)R/O@G0$K1ZQ,V^ZSZT[^;V'=R]_O")8%_.[DJ!2NN@:H!KJ/7&.I%U
+MMV&_8G<]#@VBZ%=CTMDJBSMNH^=Q%>&&'5Q*\CBUM\KGT+_MK<=I'J^RX2JK
+MP4HP/0QM%O<UPIG"F:=(W1FH>S`.M(!^I,%@0`BT#\O$SA`)<@#>0"U`=@2<
+M3N_9R<->LA\O%ON46#(B)7E%+GI*[F4$&?47=R'&5:6C9REZNECTFB594I)7
+M9*/7^NBE@T1&I4H7<4O4V+,8UQ6.GB$UU@>>WY?/O&*Z8_'M@6H!%K.P'L>^
+M8'40KF!U$*Y@=1"N:'40L&!U$*Y@=1"N8'40KFAU(-#Q<DV<<)1[([)J:#OH
+M7&Q&MAU/[.UBV#%RU\F]UK_3Q-.;X0HV<<+M-O'199U=KXVS!9LXX8HV<;O\
+M_385F+F^C*9QK<!@2=D0*,\Y,P/[[R?7_WSX'4:/<,)G1%)HO:PH,4T-LJ67
+MF('&@7W/;^ZO'K[=KSBY>+6^F#(:LQ@AZL)=&[M[>_WQS=:ZQ#%EH^B)BW3>
+M'`/'$*<>G<5/`SRAN#I+]"-2)!.9<'.JA)/_=V\]KG2JX*?!X0]G0CO.LPT`
+!````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
index 75debd4f1ac2..1c5ff2872213 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-mbr.vhdf.gz
-M'XL("&&F>54``VEM9RTV,W@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``
+M'XL("%D7AE4``VEM9RTV,W@R-34M-3$R+6UB<BYV:&1F+F]U=`"ME3UOPR`0
+MAO?\BI.Z9;```W:61(J:SI6JMK/CX"A#VJ5#!__X'F`</NQ\5`!!.`>/W^,.
+M3(@M`)P!:2;Z>4._+<+:+Y8+0Z/[QX`U`4(38(%`BVL1AQ-09B-T7W;Z4??:
+M0'1K\5D-8]N@1T*QP8IE77BXP[@J;?,&@_/+Q=WN,:`0T#0)\-WI8U=E/*ZO
+M4IGC6YN$$15P`4)"S>Y5^+G[B!1:',WEL,6Q6S@GV&;0%&[CX4HT=MY,FXG#
+M*C_O_+&'6]N?P_%KZG`GB)HRS#HK\B9+C35<Y\<9J`):`JD'&PN!8WSAHF^5
+MRF"!NU?T0>INHW%5.)]Z.';#70AQ^_%FF0CAC=U;I^K:S,&@\<FX\^1J2'AR
+M+8[EO0A6YF;!#,19:3]OZ%^+L%H@'X"Y=I"Z;YLL078@%4BAQQ4'N8*J]H$L
+MS*2^_?Y2[<_IUXNPP5%[&4PVO9Z5^K3("EBC7R(/>NSI>]H=EZ?ST>'<5>5>
+MS*7>=($0'KE+8W=?MF_/L;HRWB0:[1[3.OUK#_\)=F_CX_CHK,*^-3C7@H?`
+<,'55&9P@T:K_QM;B9.94P>_NX@\-:E?7$`D`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
index cb329a17e9b7..6726144ccb39 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
@@ -1,15 +1,15 @@
 # $FreeBSD$
 begin 644 img-63x255-512-pc98.vhdf.gz
-M'XL("&6F>54``VEM9RTV,W@R-34M-3$R+7!C.3@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@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@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``
+M'XL("%\7AE4``VEM9RTV,W@R-34M-3$R+7!C.3@N=FAD9BYO=70`K94[;X,P
+M$,?W?(J3NF5`?@-+D**F<Z6J[4RIB3*T73ITX,/73^H'Y%$9$\=P^,?_[NP#
+M(7L`,`*H7^C7#=.^BMNTV6X,#8^W`3F'/@<^*Z#!$:VO93`P4*/D!#J:$<X,
+M4^6.SOU['%;&'.1FK1IF7#7CG+NL</P(.BOD=H6U+*RP,0IY#8P#%]"0:Q6^
+M'EX2A197+"461R[AO&"W>!9P78"CRC@&3X:+#08,5+J+<!S@=O;G<>R<.A4)
+M))<,J\[RLHNE42V>%^89L`1,`37.1F+@G%_XT]?F,DCD[AE]D+O;:UP=/X\#
+M'+G@+L2X-XT+\AFE\$+T=KFZH7`R<+HSKMRY&A+O7(LC90M!:RJ+6H&ZBF?]
+MNF%ZK.)F@<P!2T40^Z^;H"!&$!($U^.:@6BA;D(@B5?2-'Q]RN'[]!-DV."P
+M+0:+IYY/J-XMH@;2ZY>(=ST.]-T=CMO3Q]'C?*GR+V9"!YTK"$O<Q:F[#_NG
+M^U0=38.$D^@1K3,L>^I.%+TNQ+'96:GZP>#\&5U$AJ5297`<);/^FUN+$X67
+.BOKP;GX!NP-G!1()````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu
index cc939bc0a832..654482e92b40 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu
@@ -1,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-63x255-512-vtoc8.vhdf.gz
-M'XL("&BF>54``VEM9RTV,W@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@U`8`(Q#38!7;C("%07&@!(`:G<2[)%L@ME_*_7P]D3HR\X/LPDP;(V7
-MYP>O68/99<-LM@-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@M/D%69,Q12X'````
+M'XL("&,7AE4``VEM9RTV,W@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'````
 `
 end