56 files changed, 710 insertions, 711 deletions

diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
index 324579020e61..9b2f1227bf7c 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-apm.vhd.gz
-M'XL(".W%'50``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4?<^O
-MN-+>*BT"#+A[7-7F;5*U:L\M<W`5:6VC)M+ZD!\_+A\!V^`F&0Y!6/@>#N=^
-M`"'N`9`-R!ZD!BEPW'*0WZ"]!C"3OC';4_\*A^[M57?[S<?2/X>%`Z,DM1J:
-MHSUK@)M%6F`*%Y%K',,AP"R_W#U?;5Z>`QSS<&%A+H$S$`:$3]:1Y,@.D58W
-M#[<6\BFR:Z;LHI7Y_^9`.%":?-$$=D]'CD<X;JSZWK86E+(T0QN\#";B9D=P
-M@HRL$IHY49/-YN#DG-4Y<%<+[PL7*B8P6M,;Z2BT#,<F;((.DV9"Y6.W5>\[
-M/>+'"J$BC_SH9*XI;Y?Y4&'A8\^`8SC/;1<LRGX,EPF5_U)/#NVX'Q@1B`@3
-MS&Y_J%Z$@I2?I&1&\[(SBOP4\C.I*5A(=MN:SS9\]Q-AR-@=JN#=B_7K<-ID
-M"%_GHB*^C'/W_D<V7#KDQRF&,49RAS%\"K_OV^T?G8%CM;;KX)HI.]'[G+-)
-MYTJT[5WI%GU@]VBR;;_9;]Y>'P,<%BHLM1;Q='8O:IME)RK[5I_HV^LD3\C$
-MMQ#XZ=JQIZT[)`J/)Z2(9Q!;&^("Y\S[!'#UKK4YA;[^6CVD^FE>EQ\E)^C'
-M$OU<DJ3ZI;6%E@[QR_G-ZH>'29N)S:C?[J\+Q,"OMG[*ZT=4IB]/'.Z7PY\#
-M9+Z85JO.+%:_.@RY!ZS&D,<<KL60ZEEGGNMEZ1E6NNK*<I6YY*J+<!6ONM*7
-CK*(5.>NJ*WW)JG351;B*5UV$JWK5E;:@+OX!7ZN]MA\-````
+M'XL("'`EAE4``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4?<^O
+MN-+>*LV":\#=XZ:U;Y.J5=,>6]?!E=6UC9I(ZT-^_+A\Q-C&;I+A$`3"]_AP
+M[@<PYAX`58)J06E0DL:5`/4%JDL`L^@;VI[[*>R;UQ?=[+KWPC_[E0/C++8:
+MFI,]EB#,1RK`FCZBUC2&?8`I/ET]7G3/CP$./1QZ(%F158F@'B;?4>S`CI!^
+M=_AD(>][=N6476]E_@\"F`#.HS?*P.[^P/$`)XQ5V]I6$2/2)[3!9+!`<$]%
+M,863;&05T4R)&FTV!:>6K$Z!NUAY7[A0,8%1F=Y(QZ%"&INP"3I,F@F5]^VF
+M?MOJ$3^<"15UX,<G:^7\=M&'"H:7/0-!X;RT7;`HNS%<(E3^2STUM!-^8$1@
+M,BR@W?Y0O1X*8GZ*LP7-YYTQRZ\F?B8U)?;99EKYT8:O?A(,&[NCGO'NV?HU
+MM&PR1*Q34=%/QKE[\R,9+@WQ$YS"F"*YH1@^AM_7S>:/3L!AKNTZN'+*3K8^
+MYVS2N1)M>U>Z91O8W9ELVW6[[O7E+L!1H:)2:Q&/9_=<;Y+L9&;?ZB-]>QGE
+M"9OX%@(_G3OVM'6'(N'IA)0@$*0YR`3@VA"7M&;F$\#K-ZV_W7[__.OZ-M9/
+MB[S\.#M"/XST<TD2ZQ?7%CYWB)_/;U$_.DRJ1&SV^FW_ND`,_'+K5WO]6)WH
+MYQ?V-\7PYP#1%]-LU1G[ZI>'H?"`V1B*/H=S,>1ZT9FG>EEYAIFNNFJ^RIQS
+KU26XC%==Y4O6K!4[Z:JK?,G*=-4EN(Q778++>M55MJ"N_@%!NLDU'PT`````
 `
 end
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 273dc480bbce..7f58bbc8fd28 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(""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@<`````
+M'XL("'`EAE4``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K551:\(P$'[W
+M5QSL90@K:7))]'%C^C8HD[%'J;:5LJG%"=M#?_R2)EE36T5'XA$:SOOX[KO+
+MA1"S`)`#IT"4$6MTHO?V?&)0SUXCM>XCM^J1`8LO19V'BTY6/1H;0*K=G`!F
+MO3CF`\9=1YV\G`(:.,T/8Y!$FUB#X%?Q>ZRJSWP`CH9*U\"Q/CM>--\Q@*0@
+M$<34[J(`D6NW9;>LTL.Q/);[W=+!H8(3F0Z6M[#;IM4@.QZXMGAE;2>N*2U@
+MM[;@^&'HWL.F'$(+KPJA#"EP!HA`,T6<:Y\Z]P#GASQ_6CP_O,T7OGZ(@?F)
+M*_2CGG[FDOCZ@<]/A-9/7-1/,I!RH#=;_;Z^32,Z?H'UBXG5CZ0#^WE'G43=
+MGP%$"QB,(;?363![U[6(S,V`B0](V_(V@.O]+E\?RQ__!G,[G8MBV'0\9?HM
+M$!)HVHR83'][_.YFFW&YW3@X-_W<P\&ECF*JW*M>NKR;[GM)/QK(I&7'^B)Q
+M7[VI`((0QYW$+;O$5\_`X5^R>0$K;/1QUCET'(.S6<,UT\__\W]K:^!$X%91
+,#^7H%Z>,MH[2!P``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
index 1c0e8d758b0e..2e3236dc8374 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
@@ -1,17 +1,17 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-bsd.vhd.gz
-M'XL(".[%'50``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD+F]U=`"MESUOPR`0AO?\
-MBI.Z98C@C+&[1DWG2I7:-8YC1QGZH29#!O_X<C;88(R3M-@$8<$]O'<<B##6
-M/0`R`5F#K$"FU,X$R$?(<@#5J0NV-=>?T)1?GU5Y/EY6^FD6'8PSV\HU)WM,
-M0*A),L"")I%[:D-C,*N'S6%Y_#@8'&J<F5A($`BI@@AO'LEZ=41Z7K\^M<CM
-MH"[QU0U6ZK<3P`1P;HU(C+IMK[''"655UVW)H"A:F:8X'T['X.P(E[*1E25S
-M*JB6LU,X.6=U#VZYT&O1I8I*C$S5*G0<,J2V2AL3!Z^H5+F<OHN?4S72AX%4
-MD;T^[O4E87=1IPJ:P5J!H'2><Q=:RGF,FTB5?T5/NG9"-U006&HZL'7?C=Z`
-M`EN?Y&PFYN'%".HK2)_:6ZR8J,,=S7KEOCVP)&":T79/)>1X:P3?-V]3ZUL&
-MTN6/NZ/$:[A>,+\%E^B]:U&2`1?JZ'!,L]B`$W/J*&>JNYQ-(R=SF8_L['4&
-M7@/?`\NMK+:`_?K"H._1EX&.NS/ZP'>W(%SFCN<6#J^X"RYN-[NV\^J8KZZ,
-MO!C[\<ZX<><2Q-VY'0[C'@38GBPJ`]4HOPYW-"\K]^V`J(^J:&<?FJ,JED*A
-M@=$4*F`562%6L\EV;Q9*K3#219)P$2^2A(MXD21<Q(LDX2)>)`D7\2))N*@7
-02:G^(C"V^`74/'YQ?0P`````
+M'XL("',EAE4``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD+F]U=`"METV/@C`0AN_^
+MBDGVYH&T0REXW<3[GM:KB&B,V8^L'CSPXW<&"K044'<+V)2T\_#.=*:I0C07
+M@(Y!'T"7H!/NIPKT"M(,@`;-@W4KS2M4Q==G65Q/M\A<U:*!26%;N>9LCS$H
+M^D@*F/-'])[[4+68Z&5]7)X^CBT.#0X-*$G9*D;0.^\[6G3JF+0YX;E&;GMU
+ML:^NMZ+?3H%0(*4U(V[5;3N-'4Z1U>%0/RDKXOBTC_/B###N'$4^+A$#*TOF
+M6%`M9\=P>L[J&=QR8=:B215*C)1:"IV$%+E/:=/&P7LH56Z7[_SG4@[TX42J
+MZ$Z?],;B:7?1I`JVDXT"Q>D\YR[4E.L0-Y(J_XJ>=NV4Z5`01-(.8.V^&[T>
+M!;8^+<5,S*<78U)?SOH4U5D^TDX/5*^1>W?`@H%4KU3NB88,'XW@9OT^MK[%
+M1+K\L3H*O(?K!,M'<+&I78L2][BI@08G#$OT.#6GCG.F?,K9)'`R%]G`SEYG
+MD`>0>Q"9E=46L%M?Z/6M?!GHN#NC#WQW<\:E[GQIX?".N^#B=K-K.Z].^.J*
+MP(NQ'U;&@Y7+$+=R&QR&W0BPWEDH`VF6WTX/5&^1>S=`-%M5L+T/VZTJE$)E
+M@,$4$K`,K!#+V61[-@NU41CH(,FX@`=)Q@4\2#(NX$&2<0$/DHP+>)!D7-"#
+0I*:_"$(L?@%=YQ4O?0P`````
 `
 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 d5043499e754..27582eeca80d 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,13 +1,13 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-bsd.vhdf.gz
-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,`<`````
+M'XL("',EAE4``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD9BYO=70`K90[;X0P#(!W
+M?H6E+N@&E)@DP%KI=J9V!@HG5+5=.G3@QS<&`C&ONU:$*`(Y_O!;B&$!*`11
+M;)S[@NXYXD\77(*>A@34"2@-VD!JKXMYLP\FZ%ZO+Y&_NA$GC[3V<=%B.1S>
+MPTT&RT=P,6E)1L%TPNT)!EPXLL(9IXZLLY$0]9^<U6?%SN4V7>CY>0;9@-`@
+MG)?(@5-^8;8O6YN!S-T#^V#M;D&XA-^7'@[ON`L<5Q[F]MBZ<&U==7(RXF5G
+M/-BY!.&=.^#PW$&`_62Q%6AOK<]]09='_!F`:@2>%D$]SCX3@VG`U&`TO2<*
+M3`9)Z@.15U)7?7W6U7?[XV>8<)20IMG>I(\Q=8M)``OZB7FC=\^^I^OMTG[<
+M',Z-*C>1;+-9K1C!E"MW]:+96GSOD?EL7;P.DO:CEQD0"J1DCH_6Y;R<":<F
+F9^L&2M7'QVWVP02;HXIP6BRT_IO;`6=.+A5;?,$O]2/CMC`'````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
index 6eb54df46a06..b886967c5553 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-ebr.vhd.gz
-M'XL("._%'50``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD+F]U=`"METU3PR`0AN_]
-M%>MX\]"!#6S:JZ.>G7'4JVE,'`]^C'KPD!\O!$@@"=@H34J3@7WR[K)L*&/F
-M`T`%4`O4`$E]70J@/90[`-5I3^Q;;F^AJ]]>F_KK^7MK/]W&P#CSK4)S;8\%
-M"/60$K#2#Z%'?0V=PVQ/+Y_.GE^>'`XMSCU8$`@$J2!B]AQB@SI-NCJ_N>B1
-M#Z.Z8JYNM%+?@P`F@'-O1.'4/0P:!YQ05FW;GR5452_3G<%-T#$Z.\%)-K'R
-M9"X%U7-V"4<IJS6XLXV="Y,J*C%*U:K0<2A17ZNT<7&8G2I5OC_?JX_/9J(/
-M(ZE"@SX^ZROB[J)-%72#K0*ATSGE+O24KREN(57^%3T*[82]4$%@TG5@[WX8
-MO1$%OC[B+!'S^&1$]55)O_[@\.&P&AA1:'#UX'`E1X],DHS!1![7=^+C'G.[
-MVZX#2JDKQA1XZ_35VDJ5.E8MM/&.[GP;'H.^1@-EJ:NO)-CAL0[?7]XM34<3
-M6;WKXV=P^!MN$,R/P16VE+J1?F;$.[HQ3<ROPXF4.KV$FU7.RLRYU^PF=OX\
-M`U.KI`:VLWT8`H?YA5'??BX#`W<3^F#N;J5Q93B>>SC\Q5T(<8?DW*;5G<S5
-MU9DGHYVNC"-7KH:$*]?@,&\AP+ZRJ`Q4H^9MO*.[WH:'`:)]<V1[%:&M?=D4
-M"@O,IE"X8II/8<&2R;8V"\DJS+2OIWBY_\N^GKQRGV%?3Z[<QZS8JGT]V7*?
-<:5]/KMSGV==K7-9]/:E_;(QM?@!J8S.+#`X`````
+M'XL("'<EAE4``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD+F]U=`"METUSI"`0AN_S
+M*SJUMQPL:*&=7+<J][WLYAHUFII*[4=M<LC!'[\@H"!"QBRCPVA!/[[=-"W#
+MF/D`4`TT`@U`4E\W`N@.FC.`ZK0GSBVWMS#UOW\-_=OEO;*?Z61@G/E6H;FV
+MQQJ$>D@#V.J'T).^ALEAJB_WS[>7G\\.AQ:'%B0;;54C4!<]A]BB3I,>+O@R
+M(Q]7=76L;K52WTX`$\"Y-Z)VZAX7C0M.**MQG,]&*]+Q<6=P$W1HW$M5Q3C)
+M-E:>S+V@>L[NX2AG=01W>[)S85)%)4:C6A4Z#@WJ:Y4V+@[1J5+E_?5/^_=U
+MV.C#1*K0HH]'?77:7;2I@FZP52!T.N?<A9GRML7MI,I_18]".V$O5!"8=!TX
+MNQ]&;T6!KX\XR\0\/1E)?6W6KT\XW'6'@0F%!M<O#K=R]<@DR1I,Y&E]-S[N
+MJ;2[XS&@E-"V$?"[T]=K*Z'*7KO3ICNFKU5X+/H&#53E4U5?27#&:QU^N/^Q
+M-QU#8O4>CY_!X4>X13"_!E?;4NI&^IF1[IC6-#&_#B=RZO02'@XY*POGWG#>
+MV/GS#$RMDA[8V?9A"%SF%U9]=[$,#-S-Z(/8W5;CFG`\]W#X@;L0XKKLW.;5
+MW<3J^L*3,6Y7QI4K5T/"E6MP6+80X%Q95`:J47&;[IB^5>%A@&C?',5>16AK
+M7S&%P@*+*12NF)936+-LLAW-0K(*"^WK*5WN/[.O)Z_<%]C7DROW*2MV:%]/
+>MMP7VM>3*_=E]O4:5W1?3^H?&V.G?Q5QFYT,#@``
 `
 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 dbd42befd234..b4d9f24650a2 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,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-ebr.vhdf.gz
-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@`````
+M'XL("'@EAE4``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K96Q<H,P#(;W
+M/(5RW3)PMK`,K+W+GJ7M#`1RN5[:I4,''KXVQL3&0$C/X!#G9'WY94F&,7,!
+MJ,_L6#9TR>3J=H==3^/5T\"VG04:7*V\U`(U2AHF:C#NX#@#Y,OZ]B[N'#O<
+M]CD@$91E`'RS^E!["016SCR7#=UKXM^C/J&!E($@(`DY;@WXX_@^EP[!8^V?
+MP>$CW"B8;\&EVLM9Z5;&LJ&[EXGYMCBQIDXA6/-4L!2Y]D0^\7/S#$QU20TL
+M'VSH`\?\PEU?$<I`+]P5?1"&6VI<YJ_G#@X?A`L^KEK-[;JZ?:BNCIP,FG;&
+MQL[5$+]S#0[C'@38GRRJ`M6J\+ELZ$Z)?QN@&(#1=I"&5Y%,0;8@&Y"DYYD`
+M64"6NT#T*ZFKO[^:^N?ZZV98X_CXY@B']L=4=XO,`$O])_*LYXZ^E^/E<+U=
+M+,X>5?9$4LVFO%($607ATJ39KOC9(T]W=6FX2>3N7B&!">#<"WQ0=_++F?IS
+HW@;;M%")?G_L\'YXAMFC2N.(3;S^FUN#DY%+1=7>[@^&L-RROP@`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
index 6936b1379dc6..319ec0e000eb 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
@@ -1,22 +1,22 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-gpt.vhd.gz
-M'XL("/'%'50``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD+F]U=`"MF$MOVS`,Q^_Y
-M%!QVZS#7DB79N0Q8L1;8K7O==JCER$4/RQ[IH1C\X2?*\D.VY"$M$]5(H/#G
-M/RF*8IWG_0M`%:!:4`:4Q,^E`+6'L@*PDWYP=V7^*W3-SZ-I'A^>,O_J=CV,
-MY7.KT!SM>0'"WJ0$7N--U`$_0S=@LM?7]Q<//^X''/>XX<9"@>`@+42L[J/R
-M41V2;JZ^?'#(NTE=L58W6=D_+2`7P-CL%\6@[F[4..*$M6I;-THH:[0=1_`E
-MF$#<WRQ;XV2^L)K)C`5UYFP,I[:LSL%=[/Q:]*EB$Z.T5QLZ!B7'SS9MACBL
-MADV5I].O^L_)+/3Q1*JH41];S15I=[E/%3[\V"L0F,Y;[H*C/"YQD51Y4?14
-M:#>LK@U"+H<)[MP/HS>A8*Y/L7PCYNG%2.JK49_=6WD=N:8GNJLL?(]`K<\#
-M#A$,<:/#NL'XN3IBS.11GR138(N-!<EG\=,'XO75[7E`*:&N5\!O@[[&+8=T
-M!6^/B6&+@V`@;?&;TMGY+INYONN;CW#[_O-7A'V?W&TP70X<J@::/;1ZH6Z]
-MT[9K2\/[[.-MU-DBB;N,XW"SM8<-7&RD<6++RA]E9S@K\]"JFEL5!G0!;0WU
-M(8%[M\!1UV6#TUI!V>`1+ADT[BP_*#S(H++;I'(0#MQ*M`>[/84U`KOCI^S8
-MP]YFO]]X?8;YC(B-]$0J>L;5Y2KE;CD5[(2[$.*HZ[*I,'J2+'I[GRRQD9Y(
-M1J_NHQ</$D8OMG7'4RW+7H4X31L]YDX-NS]L_5Y?TQ/=;1:^>R#WQQ#9N<9]
-M(253*#R03*'P^Y=0(3.;BWGN*BN_*$05!G&$%09QA!4&<:05!H&$%09QA!4&
-M<805!G&D%4;1-D+*-T)%!8;A/RXZS)IT2]-5V:D7=AFXZQJA9/NTT0C%%X.R
-M$5+_:X1:DW)VY"R<)6R$%'4CI'PA)7J6H89&:*WA.<\RU-`(S6[\@F<9*MX(
->/?=9!N((GV4@CO!9!N*(4X79WF7W#]HOQ!D`$P``
+M'XL("'LEAE4``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD+F]U=`"MF$UOU#`0AN_]
+M%8.X%9'&CNUDA80$4I&X%03JA4/CK%.M$,O']M!#?CP>Q_EP8@>VG5TWVI5W
+MGKPS'H^GR?/^!:`*4"TH`TKBYU*`VD%9`=A)/[B[,O\5NN;GT30/A\?,O[J+
+M'L;RN55HCO:\`&%O4@*O\29JCY^A&S#9R^O[R\./^P''/8Y[D"S1JN"@].H^
+M*A_5(>GVP+\[Y-VDKEBKFZSLGQ:0"V!L]HMB4'<W:AQQPEJUK1LE%!IMQQ%\
+M"280]R;+UCB9+ZQF,F-!G3D;PZDMJW-PEQ=^+?I4L8E1VJL-'8.2XV>;-D,<
+M5L.FRN/I5_WG9!;Z>")5U*B/K>:*M+O<IPH??NP5"$SG+7?!41Z6N$BJ/"MZ
+M*K0;5M<&(9?#!'?NA]&;4##7IUB^$?/T8B3UU:A/V'U61Z[IB>Y]%KY'H-;G
+M`8<(AKC18=U@_%P=,&;RJ$^2*;#%QH+DL_CI/?'ZZO8\H)10URO@UT%?XY9#
+M@E`@=I@8MC@(!I*#G-+9^2Z;N;[K#Q_AYMWG+PC[-KG;8+KL.50--#MH]4+=
+M>J=MUY:&]]G'VZBS11)W%<?A9FOW&[C82./$EM5XEORWLS(/K:JY56%`%]#6
+M4.\3N+<+''5=-CBM%90-'N&20>/.\KW"@PPJNTTJ!^'`K41[L-M36".P.W[*
+MCCWL=?;[E==GF,^(V$A/I*)G7%VN4NZ64\%.N`LACKHNFPJC)\FBM_/)$AOI
+MB63TZCYZ\2!A]&);=SS5LNQ%B-.TT6/NU+#[P];O]34]T=UDX;L'<G\,D9UK
+MW!=2,H7"`\D4"K]_"14RL[F8YZZR\HM"5&$01UAA$$=881!'6F$02%AA$$=8
+M81!'6&$01UIA%&TCI'PC5%1@&/[CHL.L2;<T796=>F%7@;NN$4JV3QN-4'PQ
+M*!LA]:]&J#4I9T?.PEG"1DA1-T+*%U*B9QEJ:(36&I[R+$,-C5`^!?`9SS)4
+@O!%ZZK,,Q!$^RT`<X;,,Q!&G"K.]R\5?C-I*)``3````
 `
 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 88c76f9f3d20..b8ea03f870c5 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("#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``
+M'XL("'LEAE4``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD9BYO=70`K9??B]0P$,??
+M]Z\8\>'DQ)#?[;X("J?XMAX>OOC2'\FQB"N"B`_]X\TD[37I)H63=$/I,IW/
+MSG<ZT\E2&@X`R8%VF7/9,+TGZ6<ZW!X\C?7/`[K?QQ`V0.*``3<X(^5XCS%@
+M[;PH\U[!V2W>KM<>1];C%8EP8^RU665#C",!M\BUSP,J!5UW!7Q8XN/^<2B0
+M&N01N+N?@F2@."CYA//:U1#'=_?A$YS>W7]!V+=5+F?..`A@'&2#E#0Z5I;[
+M\3Z5&W`N(,P^;[)B11%WL\U>P`G$C3NXW"KCY)X7Y66Q>9RBJ5<;>PD#O0#;
+M03<6<&\W.%VY\B2:>PW-`-J`8C!8O!@U,`;0NC8)/<&!NQ"/T##@/0*GRV=R
+M";`WY-?K.3[)YHK(K;*AE#V)I4+;DMP&:WM7+J0X43M[+69/5<O><2Z6W"H;
+MBMGK0O;R2<+LY5K7X>:LD1<IKJ^;/>:GANL/]_Z^/I<-TXFDGP"4,[!:A-+:
+MH6)W(*YB=R"N8G<@KFIW(+!B=R"N8G<@KF)W(*YJ=SB@H?6&..*P]@R%1H-M
+M<`.1A%$<QQ/YX_85>-PD<@W?&_T[0SS_,$S%(8ZXW2%N35'L<FS$5ASBB*LZ
+MQ-6\_=8"M.\OK?"ZD:!=2[4QD*\UXX'#SXL9?I__QME3_LT,ZR9YL]"?"RQ,
+M[5JDPQ_1(UY'\;V\>[P]_WA<<'Q6M210->@E..C^2JY*Y7X]\^\>>5JCR[RF
+M5)R]HP8J\143"Y^C.Z6EHOP.:!%K++02?9]6\B4Q9`L9<;Y4XIO_]]D&7.U2
+.<7\-#O\`_#?S";,-````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
index 92039f8fa627..a3ebac582f05 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-mbr.vhd.gz
-M'XL("/+%'50``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD+F]U=`"METU3@S`0AN_]
-M%>MX\]!)EF2A5T<].^.H5P'!\>#'J`</_'@32$("!(NFI10FV8=W/[)-&1M>
-M`)0!M4`-D-37N0`Z0%X`J$%S8'_FYA:Z^NVUJ;^>O_?FU>T&&&>^56BN[3$#
-MH1Z2`Y;Z(?2HKZ&SF/WIY=/9\\N3Q:'!V0<+`H$@%43,GD/,J=.DJ_.;BQ[Y
-M,*K+YNI&*_6I!#`!G'LS,JONP6ET.*&LVK8_<BC+7J8]@IM@8'1V@I-L8N7)
-M7`JJY^P2CM:LMN#.=B870ZFHPLC5686.0X[Z6I6-C</L4*7R_?E>?GPV$WT8
-M*15R^OAL+(N[BZ94T$XV"H0NYS5WH:=\37$+I?*OZ%%H)\R%"@*3=@![]\/H
-MC2CP]1%G*S&/)R.JK]3ZU-IBY<(Y/M"=[\.W`U;5-F#!!H4ASCE<U<[A4HX>
-M#44R!A-Y/"$G7ORJQ\3YK=IM0"EUQY@";ZV^.G4Z&@V4N>Z^DJ#`8QV^O[Q;
-M6FY-9/7^L5DU^!O.">;'X#+32NU,OS+B`]U8)L.WQ8DU=7H)-YN<E8EKKRDF
-M=GZ>@:E54@,KO";C`5U^8=1WF,O`P-T5?3!WM]2X/)S//1S^XBZ$N&HUM^OJ
-M3N;JZL3):*<KX\B5JR'ARAUPF+818-]95`6J6?-S?*"[WH?O`8CFER/93Q&:
-MWI=,H3#`9`J%;:;I%&9LM=BV5B$9A8GV]11O]W_9UY/7[A/LZ\FV^Y@5V[2O
-?)]/N$^WKR;;[-/MZC4NZKR?UCXVQW0]_N`=E#`X`````
+M'XL("'\EAE4``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD+F]U=`"MESUOI#`0AOO]
+M%1-=EP+9@SV0]J3TUUS2!@A$JRBYTR5%"G[\V6`;&V.R)-YE69`]#^]\>-;+
+MV/P"H!)H`.J!I+ZN!-`-5#6`&C0'3F=N;F'L_KSVW?OYHS"O\33#./.M0G-M
+MCR4(]9`*L-$/H4=]#:/%%#]NGZ[/+T\6AP:'!B0K;54B4!L]AYA3ITGW9WR>
+MD`^+NC)6MUBI3RN`">#<FU%:=0].H\,)934,TU%I13H^]@AN@@&->RZ*&"?9
+MRLJ3N154S]DM'.U9'<%=GTPNYE)1A5&ILPH=APKUM2H;&X?H4*7R\?:W^??6
+MK_1AHE3(Z>/16)EV%TVIH)UL%`A=SGONPD1Y7^,V2N5;T:/03I@+%00F[0!.
+M[H?16U#@ZR/.=F*>3D927Z/U";7.FHUS>F#\681O!VS;8\":S0I#G'.X[9S#
+MC5P\FHMD"2;R=$*NO/BUCYGSVP['@%)"TT3`WU9?ESL=O0:J]JFZKR2H\5*'
+M[V_OMI9;GUB]7VQ6/7Z&<X+Y);C2M%([TZ^,],"XE,G\;7%B3YU>POTA9V7F
+MVNOKE9V?9V!JE73`:J_)>$"77UCTW<0R,'!W1Q_$[C8:5X7SN8?#3]R%$-?N
+MYG9?W56LKLN<C&&],BY<N1H2KMP9AWD;`4Z=156@FA6?TP/CKR)\ST`TOQS9
+M?HK0]+YL"H4!9E,H;#/-I[!DN\5VM`K)*,RTKZ=TN__*OIZ\=I]A7T^VW:>L
+CV*%]/9EVGVE?3[;=Y]G7:US6?3VI?VR,G?X#`*JO<PP.````
 `
 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 62cd24d4bed0..434cd61fff6c 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("#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@`````
+M'XL("(`EAE4``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD9BYO=70`K96]<H,P#(#W
+M/(5RW3)PMK`,67N7/4O;&0CD<KVT2X<./'QEC,'&@20]0"'.R?HB63\(82\`
+MA2"*&\]Y1?N:A'>[V6TZFBR?`^8"FB8")@RTN(IQO(&EH'[!(B08Q_G#(@6@
+M[-=6H$W&:YMXN--@%<N\PL<E%N?";9X#$D%11,`WYQ^NG0YE@)2!(B`-.3X:
+M\,?A?1*PQ<FUSL_B\!YN<%@^@DN-E;?3KXQY13N6B?UV.+7D'2-$_52PM'+M
+MJ7QBY^<9!'=)!2+O=1@"A_S"Z-\^=@.#<!?\@SC<PN"R<+_T<'@G7`AQY6)N
+ME[W;QMY5*R>#IIWQ8.<:2-BY%H?K#@+L)@M7(.^*G_.*]IB$MP6J'KC:"5+_
+M*M(IZ`9T#9K,.E.@]Y#E/A##2FJK[Z^Z^KG\^ADV.#F\.6(Q]IB:;M$98&'^
+M1)_,VO/OY7#>7:YGAW.CRDTD;C:V2A%T&85+DV:[X&>'/([>I?$AD7]Z>PU"
+M@91!X+UWQ["<J9OS+MBZ@5)UY^,D^!$H;HXJ@R,QL?IO;BU.KUPJ7'N;/\%5
+&,,:_"```
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
index 8df641e4f705..3445c958ed66 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-pc98.vhd.gz
-M'XL("//%'50``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9"YO=70`K9=-;X,P#(;O
-M_16N=NNA2HP3VNNT[CQIVG8M9;3:81]:>^B!'[\8$DCX6KL%*`H*?O+:<4PJ
-M1'T`Z`3T'G0!6G$[)=!K2%<`IM->6-VE?80R__PH\M/;>6F/<E;#I/"M0G.V
-MQP3(#)("9CR(?N4VE`ZSO-D<%F_O!X=#BW,#DP9"4`9"O7&T:-0QZ?[V\:Y"
-M;EMU25]=:V5^.P)!(*7W1N+4;1N-#8Z,U7Y?72ED62737<%#T-$ZV\$IT;'R
-M9`X%U7-V"*>GK*[!+69V+NI4,8F1FKL)G804N6W2QL6A=YE4.1^_LN]CT=&'
-M(ZFB&WVRUY>,NXLV5="];!40I_.4NU!13EW<0*K\*WHZM"/;,$$0RG5@Y7X8
-MO18%OCXMQ43,QR=C5%_&^LS:$MG`?;RCO%V&9P/<[:\#*L5+J`M\<@[GK&]-
-MD--0W'TG+UH=^4CV_7E^B\CQP\IAE7*Y5!I6>*G"E\WS@,,8S^$:A[_A&L'R
-M$EQB:Y][TZC%YFLSVE'CYI8U;W$TI8[77'&5LRINLF"^ZMCY\PS"Y'`.8N55
-M!0_8S"^T^M9]&1BX.Z$/^NYFC$O#]Z6'PU_<A1"WFYS;:77SOKH\\F2\=E?&
-MA2N7(>'*K7$8MQ!059E-!G*-[-W'.\J'97C60+2E/MJW`VUMCJ:0+#":0K+5
-M.:)"*B:3[=HLU%9AI(TXXR)NQ!D7<2/.N(@;<<9%W(@S+N)&G'%1-^+:_,42
-+8O8#/[LV_KT-````
+M'XL("(,EAE4``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9"YO=70`K9=-;X,P#(;O
+M_16N=NL!)2:$]CII]UVV74<IG:II'UI[Z($?/QL22`C0=@ND*"CXX;7CF%2(
+M]@#0*>@]Z`ITQOU<@=Y`O@:@0=.PN4IS"W7Y]5F5I\,Y,4>]:&%2N%:^.=MC
+M"HI>D@,6_!*]XS[4%I/</;RM#A]O%H<&AP:4Y6R5(NAM\!XM.G5,>CG@>X-\
+M[=6EH;K>BGY;!4*!E,X3J57WVFGL<(JL]ONFY:R(XV.;=^,-,.X]24)<)@96
+MCLRQH#K.CN'TG-4MN-7"S$6;*I08.5TI=!)RY#ZEC8U#T"A5SL?OXN=8#?3A
+M1*KH3I\,QM)I=]&D"MJ'C0+%Z3SG+C24TQ`WDBK_BI[V[93I4!!$9@>P<=^/
+M7H\"5Y^68B;FTY,QJ:]@?8K663%RG1ZH[Q/_[(#;_6W`+(,B!#Y9ATO6MU%0
+MJK&XNTY>M3K*B>S[\_Q6D>.'C<-4[ZA<9AK6>*W"EX?G$8<QGL,M#B_A.L'R
+M&EQJ:I]]DM1B][69'&AQ2\-:]C@UIX[77'63LUG<9,%R/;!SYQD$Y7`)8NU4
+M!0?8S2_T^C:A#/3<G=$'H;L%XW+_>>G@\(*[X..VLW,[KVX9JBLC3\9NN#*N
+M7+D,\5=NB\.XA4`UE9DRD&MD<)T>J!\3_VR!:$I]M&\'FMH<3:$RP&@*E:G.
+M$16J:C;9;LU";11&VH@S+N)&G'$1-^*,B[@19US$C3CC(F[$&1=U(Z[I+Y80
+*BU\\?ZUPO0T`````
 `
 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 1c96ba9724ce..91bdfeba0f92 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("$$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"```
+M'XL("(0EAE4``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5/6^#,!"&
+M]_R*B[IEB.S#-K!6RIZE[0P4HJAJNW3HP(^O;4SPV4!(9;"0H^.>O.?[@+'A
+M`A`(K)IY+AOZYR.]^]UA9VF\>PPH)50Q\$4#+0Z-OE)`(T#O@@5=-RUBZ(_!
+M->*X-L8@Y[5HF,&Y<$7B\T,;L,Q!2)`*"MRJ\.WT.A,PI@MXP.$]W$TPWX++
+MC)?WIE:+_(9;,@RXO6/M)YQ84Z<1K'TH6)FV6!"+P,_/,S!=PPVPPMF0`F_Y
+MA4E?&<M`$NZ*/HC#K0PNI^]S#X=WP@6*JU=SNZYN'ZMK$B<C"SMC8^<:".W<
+M`8=I!X&PDUE7H)F1T7/9T)^/]!Z`P@&3G:!TWPZ5@>I`M:"DV><"5`EYX0.1
+M5E+??'^US<_UU\^PP?%@HOO+^&-FND7E@)7Y$_5N]IZ^I]/E</V\C+AQ5(T3
+M23>;]LH05!V%*X-FN^*'19XG=5E\2-(_O5(!$\`Y"=RI.]-REC:_8[!M![6P
+BYS,N\H,89D>5P4D6>/TWMP-.)2X5_57;_0$2<&2X<`@`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
index aadaa429871a..baee4d3f5f90 100644
--- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
@@ -1,17 +1,17 @@
 # $FreeBSD$
 begin 644 img-1x1-4096-vtoc8.vhd.gz
-M'XL("/3%'50``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&0N;W5T`*V6R6[",!"&
-M[SS%2+UQ0-[BP+5JN56JU!?`21S40Q<!!PX\?&<29W$2!R@.QC)RYO,_X[$9
-MQNH'0$O0)6@+.J%QJD!O(%T#X*1KHNJY^PF7_.?;YJ?/\\H]ET4-XZQOY9N3
-MO9"@<)$4A*%%=$%CN#28U=/K?OGYM6]PPN&:A94&)2!!B!JMHUFKCDC;YX^7
-M"KGKU,FQNLX*OYD"IH#SWANR4;=K-;8XA59E6;44C*ED-LW[X4UTS@YP"1M8
-M]61.!;7G[!1.SUG=@ULNW%[4J8*)D6*/H>.0"AICVC1Q&#5,E?/QUQR.=J!/
-M!%)%M_KX:$Z&W14N543SLE.@*)WGW(6*<AKB)E+EH>AIWTZY`0:!)<V$J-SW
-MH]>AH*]/<S83\_!F!/49TH?'"W>4;H&D.V=2XT01<GA[L!9/FG[SXV<"N_OO
-M^)FU9W?E=*R!;>C6"::+V716F\</FS&QW*UQV:TXNKX**"Q8.\#M>K@\\F9D
-M(W<M9;*\#<B&[F;DKAR\SUT?P-%%RD;Z:ESGKNB9"`\WNEQ(';3'K(\K6MQ0
-MXQ5GV:0Z&S55LO)67&$@LR`ER&2$DXG#Y62%?T3,3/3AB<O[RO_4J2+<O1+M
-MHA*Q%2H'C*80@3:R0LYF,^/>\ZN=PDA5'^$B5GV$BUCU$2YBU4>XB%4?X2)6
-2?82+6O7I*O<6?^^O%OLJ#```
+M'XL("(<EAE4``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&0N;W5T`*V636_C(!"&
+M[_D5(_76@P4#'B?7JMW;2BOUT&MP3*JHVFW5Y-!#?OPR-O[`F#1M<3#"PO/X
+MG6&8($1W`9`"V@-9H)+'E0;:0+4&<).^8=M+_PCGW>L_NSL=/@I_G5<=3(JI
+M56C.]JA`NX]4@(8_0@V/X=QCBIN'Y]O#W^<>AQZ''E16;*40J(Z^0V)0QZ2G
+M`[ZTR.VH3L7J1BMWUQJ$!BDG;ZA>W7;0.."TL]KOVU:Q(HY/WX*'8()Q+T41
+MXTHQLYK(7`KJQ-DE'%VR^@KN=N77HDL5EQB5ZUWH)%3(8Y<V?1RBYE+EX_AF
+MWH]VI@\3J4*#/AG-J;2[Z%,%^Y>]`LWI?,E=:"FG.6XA57X4/0KMM!^X((BR
+MG\#6_3!Z(PJF^DB*"S%/+T92GV%]FGA%N0J4H!%*MUDU*'(33<KA7^_6WCW>
+MT^\P?B:QNM^.GUD'=I_LCC6(#5>-9+J8S6BU^?EF,R:7NQVNOA;'Y:N!QH*U
+M,]QV@MME7HPZ<M=R)JOK@&+N;LWNJMG[TO<)'!=2$>GK<*.[.#'!`!<5%U8'
+MPS:;XIH!-]?XB;-B49W-FBKU_EI<8Z"VH!2H,L*ITN-V;.7^B(19Z-,3YS]%
+M^.M2!7U=R5:H,+="[8'9%#J@S:Q0BHN9\=7]2UYAIE,?XS*>^AB7\=3'N(RG
+;/L9E//4Q+N.ICW%93WW4YM[J/Q`EJ(,J#```
 `
 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 8b883164b87e..ddb9c0a8bc7a 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("$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_=!@``
+M'XL("(@EAE4``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$]+PS`8
+MQN_[%`]X&1-*_K>]BGH3!AZ\VJ[I&$,%\>`A']YDR6S39'5(T[2TO'U^>9_D
+MY27$#T`HE`Q*NBD8)(<0X-(&.MAX.F$>/[6^>[Z73X4?9N5AU`:S$C(7,,5D
+MF-4F`*M(1^>!%4@-PK)`CZL'5?TG;BX_CVN6LNMQ[;4X99\=.@VM)[C7$6ZW
+M\&'0Q*Z&/7!6705<3^U29]>+IR=,+^%LP*R3_#QNL,M&$A;A:"X[%/Z.<=V`
+MJQ+5G-EU-CN]:*G0_EI<UZ#58"VX2G"W*N"84TG[?Y-Y7@Z8;1%?OE1$`"Y6
+M>S(T*L6A>BA]ZE4<I8"J459C((N.&6;W\:YW7X?O\?[)T*CZ/C^=GMDF:!<I
+MP1JWB.K<^RB_FX?]YO"V/^-8<,7"PK)T*FZ[:IO8E;'=EP,[GI#;(3N>;I(<
+M[UZM0`0HC8R'[+9QL3B<^#6K>[3BM#_G&7U$@6SM.9PD$]7_2]GAU,*E8FMO
+*]0/Z[P?!W08`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
index ad1859a2056c..b5d230579fca 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-512-apm.vhd.gz
-M'XL(".7%'50``VEM9RTQ>#$M-3$R+6%P;2YV:&0N;W5T`*U6RVX;(13=^RNN
-ME%VD6L#`G739JO&N4I2HZV0Z9B)+36+%EIJ%/SY<'H9Y,+5=QA@Q8N[A<.X#
-M&',/`%:`':`&5#2N)>!7J&\`S*1OPO;<O\*A?7O5[7[SL?3/8>'`.$NM^N9D
-M+RJ09I$:1$.+X)K&<`@PRZO;Y^O-RW.`$QXN+"P1I`!E0.1H'61'=H2T^O[P
-MPT(^17;5F%VT,O_?$I@$SI,OJL#NZ<CQ"">-5=?95D/36)JA]5YZ$W&S`SC%
-M!E8)S2E1D\U.P>&<U3EPUPOO"Q<J)C!JTQOI.-2"QB9L@@ZC9D+E8[=MWG=Z
-MP$]D0@6/_/AHKLIO5_A0$>%CST!2.,]M%RS*?@@W$2K_I1[V[:0?&!&8"A/"
-M;K^O7H2"E!]R-J-YWAE9?@WQ,ZFI1$AVVZI_;?CVGF#8T!U-QKL7Z]?2M,D0
-MN9Z*BO@RS-V[GY/ATA(_R2F,*9);BN%3^'W;;O_H"3A1:KL.KAJS4YW/.9MT
-MKD3;WI5NU05VCR;;]IO]YNWU,<!1H:)2:Q%/9_?2;"?9J<*^U2?Z-B2-\(!]
-MWT+@ITO'GK;N0!*>3D@5SR"Q-L05S9GW$>#J76MS"GWYM7I(]=.R+#_.3M!/
-M)/JY)$GU2VL+SQWBE_.;U8\.DWHB-J-^N[\N$`._TOH)KQ]K)OK\Q.%NV?\Y
-M0.&+:;'J+&+U*\-0>L!B#&7,X5(,.<XZ\UPOHV=8Z*J+^2ISR567X`I>==&7
-BK*P5.^NJB[YD%;KJ$ES!JR[!%;WJHBVHBT^(Z?)+'PT`````
+M'XL("%4EAE4``VEM9RTQ>#$M-3$R+6%P;2YV:&0N;W5T`*U6R6[;,!"]^RL&
+MZ"U`!7)$CMIC@R:W`D&#HL=$D:E`R&;$!IJ#/[X<BK16JK9+F29(4//T^&8A
+MA6@?`,J!:B`#I'E<**"O4'P!L(N^H>NEG\*^>GLUU:[YR/RS7[5@4O2MAN9L
+MCSDH^Y$"L.2/T)K'L`\PV:>KQXOFY3'`H8=##Z0+MLH1Z&'R'1('=HSTN\$G
+M!WG?L<NG[#HK^W]0(!1(V7LC#^SN#QP/<,I:U;5K!3-B?4(;3`8+#/>495,X
+M+496/9ISHO8V.P='2U:GP%VLO"_:4+&!4=C>2B>A0![;L`DZ3)H-E8_MIGS?
+MFA$_C(0*'?C)R5H>WR[Z4,'PLF>@.)R7M@L.93>&FPF5_U*/AG;*#ZP(0H<%
+M=-L?JM=!09\?2;&@>=P947XE\[.IJ;'+-MOR?VWXZB?#B+$[RHAWS]:OXF6;
+M(6H]%Q7=9)R[-S]FPZ5B?DIR&',D5QS#Q_#[MMD\FQDX3+7=%BZ?LM.USSF7
+M=&V)=GU;NG4=V-W9;-LUN^;M]2[`<:'B4NL0CV?W4FYFV>G$OC5'^C8D#7K`
+MH6\A\#.I8\\X=Q`+SR>D!H6@[4&F`->6N.8U.Y\`7K\;<WG[_?.OZ]N^?D:E
+MY2?%$?IA3[\V2?KZ]6N+C!WBY_-;U(\/DV(F-CO]MG_:0`S\4NN'7C]1SO3Q
+MA?U--ORU@.B+:;+JC%WU2\-0><!D#%67PZD82EITYJE>)L\PT567XE7FG*LN
+IPR6\ZI(O65$K<=)5EWS)2G359;B$5UV&2WK5)5=05W\!EOB&R!\-````
 `
 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 48ef44ea0bdd..51eda6d76826 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("!,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``
+M'XL("%4EAE4``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"M55%KPC`0?O=7
+M'.QE""MM<DGT<6/Z-BB3L4=QMI6RJ<4)VT-__')-LJ:VBAN)1V@X[^.[[RZ7
+M.#8+``4(!K&VV!J;T-Z>3PSJV7.DUVWD5CTR8,FEJ/-PT<FJ1V,#R,@M8L"L
+M%\=]P*3KJ-.G4T`#1_PP`163R35(<16_^ZKZR`?@6*AT#1SOLQ-%\YT`*`8*
+M04[M+@N0.;DMNV6U.AS+8[G?+1T<:CB94;#Z"[OMJAID)P+7%J^L+;JFM(#=
+MVH+CAZ%[#YMR2!)>%T(;,A`<$(%EFK@@GS[W`.>'/']8/-Z]S!>^?HB!^<DK
+M]&.>?N:2^/J!ST^&UD]>U$]Q4&J@-UO]/K],(SI^H?6;6/WBU<!^WE&G4?=G
+M`-$"!F,H['26W-YU$I&[&3#Q`5E;W@9PO=_EZV/Y[=]@8:=S40P;Q3-.;X%4
+MP%;-B,GHV^-W,]N,R^W&P;GIYQX.H2B*ZW*_]=(5W71?2_;>0*8M.]X72?CJ
+M327U<I)T$K?L4E\]`X>_R>8%O&&CC[/.H>,8G,T$UTP__\__K:V!DX%;13^4
+*HQ\K>!7WT@<`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
index ef644e42fab2..9949cd1d1c15 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
@@ -1,17 +1,17 @@
 # $FreeBSD$
 begin 644 img-1x1-512-bsd.vhd.gz
-M'XL(".;%'50``VEM9RTQ>#$M-3$R+6)S9"YV:&0N;W5T`*V7/6_#(!"&]_R*
-MD[IEB.",L;M&3>=*E=HUCF-'&?JA)D,&__AR-MA@C).TV`1AP3V\=QR(,-8]
-M`#(!68.L0*;4S@3(1\AR`-6I"[8UUY_0E%^?57D^7E;Z:18=C#/;RC4G>TQ`
-MJ$DRP((FD7MJ0V,PJX?-87G\.!@<:IR96$@0"*F""&\>R7IU1'I>OSZUR.V@
-M+O'5#5;JMQ/`!'!NC4B,NFVOL<<)9577;<F@*%J9IC@?3L?@[`B7LI&5)7,J
-MJ):S4S@Y9W4/;KG0:]&EBDJ,3-4J=!PRI+9*&Q,'KZA4N9R^BY]3-=*'@521
-MO3[N]25A=U&G"IK!6H&@=)YS%UK*>8R;2)5_14^Z=D(W5!!8:CJP==^-WH`"
-M6Y_D;";FX<4(ZBM(G]I;K)BHPQW->N6^/;`D8)K1=D\EY'AK!-\W;U/K6P;2
-MY8^[H\1KN%XPOP67Z+UK49(!%^KH<$RSV(`3<^HH9ZJ[G$TC)W.9C^SL=09>
-M`]\#RZVLMH#]^L*@[]&7@8Z[,_K`=[<@7.:.YQ8.K[@++FXWN[;SZIBOKHR\
-M&/OQSKAQYQ+$W;D=#N,>!-B>+"H#U2B_#G<T+ROW[8"HCZIH9Q^:HRJ60J&!
-MT10J8!59(5:SR79O%DJM,-)%DG`1+Y*$BWB1)%S$BR3A(EXD"1?Q(DFXJ!=)
-/J?XB,+;X!=0\?G%]#```
+M'XL("%@EAE4``VEM9RTQ>#$M-3$R+6)S9"YV:&0N;W5T`*V738^",!"&[_Z*
+M2?;F@;1#*7C=Q/N>UJN(:(S9CZP>//#C=P8*M!10=PO8E+3S\,YTIJE"-!>`
+MCD$?0)>@$^ZG"O0*T@R`!LV#=2O-*U3%UV=97$^WR%S5HH%)85NYYFR/,2CZ
+M2`J8\T?TGOM0M9CH97U<GCZ.+0X-#@TH2=DJ1M`[[SM:=.J8M#GAN49N>W6Q
+MKZZWHM].@5`@I34C;M5M.XT=3I'5X5`_*2OB^+2/\^(,,.X<13XN$0,K2^98
+M4"UGQW!ZSNH9W')AUJ))%4J,E%H*G804N4]IT\;!>RA5;I?O_.=2#O3A1*KH
+M3I_TQN)I=]&D"K:3C0+%Z3SG+M24ZQ`WDBK_BIYV[93I4!!$T@Y@[;X;O1X%
+MMCXMQ4S,IQ=C4E_.^A3563[23@]4KY%[=\""@52O5.Z)A@P?C>!F_3ZVOL5$
+MNORQ.@J\A^L$RT=PL:E=BQ+WN*F!!B<,2_0X-:>.<Z9\RMDD<#(7V<#.7F>0
+M!Y![$)F5U1:P6U_H]:U\&>BX.Z,/?'=SQJ7N?&GA\(Z[X.)VLVL[KT[XZHK`
+MB[$?5L:#E<L0MW(;'(;="+#>62@#:9;?3@]4;Y%[-T`T6U6PO0_;K2J40F6`
+MP102L`RL$,O99'LV"[51&.@@R;B`!TG&!3Q(,B[@09)Q`0^2C`MXD&1<T(.D
+/IK\(0BQ^`5WG%2]]#```
 `
 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 ed4be0e25e1c..70c4c8c4391e 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,13 +1,13 @@
 # $FreeBSD$
 begin 644 img-1x1-512-bsd.vhdf.gz
-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``
+M'XL("%DEAE4``VEM9RTQ>#$M-3$R+6)S9"YV:&1F+F]U=`"ME#MOA#`,@'=^
+MA:4NZ`:4F"3`6NEVIG8&"B=4M5TZ=.#'-P8",:^[5H0H`CG^\%N(80$H!%%L
+MG/N"[CGB3Q=<@IZ&!-0)*`W:0&JOBWFS#R;H7J\OD;^Z$2>/M/9QT6(Y'-[#
+M30;+1W`Q:4E&P73"[0D&7#BRPAFGCJRSD1#UGYS59\7.Y39=Z/EY!MF`T""<
+ME\B!4WYAMB];FX',W0/[8.UN0;B$WY<>#N^X"QQ7'N;VV+IP;5UU<C+B96<\
+MV+D$X9T[X/#<08#]9+$5:&^MSWU!ET?\&8!J!)X603W./A.#:<#48#2])PI,
+M!DGJ`Y%74E=]?=;5=_OC9YAPE)"FV=ZDCS%UBTD`"_J)>:-WS[ZGZ^W2?MP<
+MSHTJ-Y%LLUFM&,&4*W?UHME:?.^1^6Q=O`Z2]J.7&1`*I&2.C];EO)P)IR9G
+EZP9*U<?';?;!!)NCBG!:++3^F]L!9TXN%5M\P2_U(^.V,`<`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
index c1f997c4041b..7bbe238939ff 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-512-ebr.vhd.gz
-M'XL(".?%'50``VEM9RTQ>#$M-3$R+65B<BYV:&0N;W5T`*V735/#(!"&[_T5
-MZWCST($-;-JKHYZ=<=2K:4P<#WZ,>O"0'R\$2"`)V"A-2I.!??+NLFPH8^8#
-M0`50"]0`27U="J`]E#L`U6E/[%MN;Z&KWUZ;^NOY>VL_W<;`./.M0G-MCP4(
-M]9`2L-(/H4=]#9W#;$\OG\Z>7YX<#BW./5@0"`2I(&+V'&*#.DVZ.K^YZ)$/
-MH[IBKFZT4M^#`":`<V]$X=0]#!H'G%!6;=N?)515+].=P4W0,3H[P4DVL?)D
-M+@75<W8)1RFK-;BSC9T+DRHJ,4K5JM!Q*%%?J[1Q<9B=*E6^/]^KC\]FH@\C
-MJ4*#/C[K*^+NHDT5=(.M`J'3.>4N])2O*6XA5?X5/0KMA+U006#2=6#O?AB]
-M$06^/N(L$?/X9$3U54F__N#PX;`:&%%H</7@<"5'CTR2C,%$'M=WXN,><[O;
-MK@-*J2O&%'CK]-7:2I4Z5BVT\8[N?!L>@[Y&`V6IJZ\DV.&Q#M]?WBU-1Q-9
-MO>OC9W#X&VX0S(_!%;:4NI%^9L0[NC%-S*_#B90ZO82;5<[*S+G7["9V_CP#
-M4ZND!K:S?1@"A_F%4=]^+@,#=Q/Z8.YNI7%E.)Y[./S%70AQA^3<IM6=S-75
-MF2>CG:Z,(U>NAH0KU^`P;R'`OK*H#%2CYFV\H[O>AH<!HGUS9'L5H:U]V10*
-M"\RF4+ABFD]AP9+)MC8+R2K,M*^G>+G_R[Z>O'*?85]/KMS'K-BJ?3W9<I]I
-;7T^NW.?9UVM<UGT]J7]LC&U^`&IC,XL,#@``
+M'XL("%PEAE4``VEM9RTQ>#$M-3$R+65B<BYV:&0N;W5T`*V737.D(!"&[_,K
+M.K6W'"QHH9U<MRKWO>SF&C6:FDKM1VURR,$?OR"@($+&+*/#:$$_OMTT+<.8
+M^0!0#30"#4!27S<"Z`Z:,X#JM"?.+;>W,/6_?PW]V^6]LI_I9&"<^5:AN;;'
+M&H1Z2`/8ZH?0D[Z&R6&J+_?/MY>?SPZ'%H<6)!MM52-0%SV'V*).DQXN^#(C
+M'U=U=:QNM5+?3@`3P+DWHG;J'A>-"TXHJW&<ST8KTO%Q9W`3=&C<2U7%.,DV
+M5I[,O:!ZSN[A*&=U!'=[LG-A4D4E1J-:%3H.#>IKE38N#M&I4N7]]4_[]W78
+MZ,-$JM"BCT=]==I=M*F";K!5('0ZY]R%F?*VQ>VDRG]%CT([82]4$)AT'3B[
+M'T9O18&OCSC+Q#P]&4E];=:O3SC<=8>!"84&UR\.MW+UR"3)&DSD:7TW/NZI
+MM+OC,:"4T+81\+O3UVLKH<I>N].F.Z:O57@L^@8-5.5355])<,9K'7ZX_[$W
+M'4-B]1Z/G\'A1[A%,+\&5]M2ZD;ZF9'NF-8T,;\.)W+J]!(>#CDK"^?><-[8
+M^?,,3*V2'MC9]F$(7.875GUWL0P,W,WH@]C=5N.:<#SW</B!NQ#BNNS<YM7=
+MQ.KZPI,Q;E?&E2M70\*5:W!8MA#@7%E4!JI1<9ONF+Y5X6&`:-\<Q5Y%:&M?
+M,87"`HLI%*Z8EE-8LVRR'<U"L@H+[>LI7>X_LZ\GK]P7V->3*_<I*W9H7T^V
+=W!?:UY,K]V7V]1I7=%]/ZA\;8Z=_%7&;G0P.````
 `
 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 a4c9a85a934f..e70f7b57d043 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,14 +1,14 @@
 # $FreeBSD$
 begin 644 img-1x1-512-ebr.vhdf.gz
-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_"```
+M'XL("%TEAE4``VEM9RTQ>#$M-3$R+65B<BYV:&1F+F]U=`"ME;%R@S`,AO<\
+MA7+=,G"VL`RLO<N>I>T,!'*Y7MJE0P<>OC;&Q,9`2,_@$.=D??EE288Q<P&H
+MS^Q8-G3)Y.IVAUU/X]73P+:=!1I<K;S4`C5*&B9J,.[@.`/DR_KV+NX<.]SV
+M.2`1E&4`?+/Z4'L)!%;./)<-W6OBWZ,^H8&4@2`@"3EN#?CC^#Z7#L%C[9_!
+MX2/<*)AOP:7:RUGI5L:RH;N7B?FV.+&F3B%8\U2P%+GV1#[Q<_,,3'5)#2P?
+M;.@#Q_S"75\1RD`OW!5]$(9;:ESFK^<.#A^$"SZN6LWMNKI]J*Z.G`R:=L;&
+MSM40OW,-#N,>!-B?+*H"U:KPN6SH3HE_&Z`8@-%VD(97D4Q!MB`;D*3GF0!9
+M0):[0/0KJ:N_OYKZY_KK9ECC^/CF"(?VQU1WB\P`2_TG\JSGCKZ7X^5PO5TL
+MSAY5]D12S::\4@19!>'2I-FN^-DC3W=U:;A)Y.Y>(8$)X-P+?%!W\LN9^G/>
+G!MNT4(E^?^SP?GB&V:-*XXA-O/Z;6X.3D4M%U=[N#X:PW+*_"```
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
index 61a70ffb93f4..9e6e5ae96966 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
@@ -1,22 +1,22 @@
 # $FreeBSD$
 begin 644 img-1x1-512-gpt.vhd.gz
-M'XL(".C%'50``VEM9RTQ>#$M-3$R+6=P="YV:&0N;W5T`*V82V^<,!"`[_D5
-M4_66JA0;V[#'1DVDWM+7+8>`@6BE=OM(#E'%CZ_'V(`7FW238;V(E7<^YN7Q
-MR'D^7@"J`-6#ZD!)?"X%J!V4%8"9=(/;.W,_8=`_#YU^V#]F[AK.1AC+EU*A
-M.,KS`H1Y20F\QI>H%I]A\)CL]>7=^?['G<=QA_,O%@H$!VD@8O4>E4_:(>GJ
-MXLL'B[R=M2O6VLU2YML(R`4PMOA'X;6[G72<<,)(];T=)90URDXC^!%,(.YO
-MEJUQ,C^26J@9<^K"V!A.;4F=@CL_<[$84\4D1FGNQG4,2H[/)FV\'U;#I,KC
-M_:_ZSWUWI!]/I(J:]&.KN2)M+G>IPOV?G08"TWG+7+"4AV-<)%5>Y#T5ROGH
-M&B?DTD]P:W[HO1D%2_T4RS=\G@Y&4K\:]3-K*Z\C]_3$<)&%GPG8-*<!O0=#
-MW&1PH]%_MHYTW6S1F"2S8XN-@.0+_S4M<7R;_C2@E%#7*^`WKY^VX9"VX.TP
-M,4QQ$`RD*7YS.EO;I5[J=WGU$:[??_Z*L)O97(WITK6X@DS5[=LC[=8K;3)W
-M'UMLFH_9Q_NHL442]RZZ=C4N-J-4&A<;:9S8DG);V?\74BWS4*I:2E42*@Y*
-M0ULG<=\#''5=[G"Z45!JW,(E`VWW\E;A1@:562:5A7#@)NYF8S>[<(/`X?`I
-M.XRPM]GO-TZ_CKF,B(WT1,I['=_*"%3J"7,AQ%'7Y:Y"[TDR[^U<LL1&>B+I
-MO7KT7MQ)J%1LZ4Z[6I:]"G$-K?>8;1_-^C#U>WU/3PS76?@9@=QM0V3[&G>%
-ME$Q#X8!D&@JW?@DU9&(SF*=&6;F@$%48Q!%6&,015AC$D588!!)6&,015AC$
-M$588Q)%6&$7;""G7".6E#4`!31>JD6QI!A\(WW)X'-]JGS8:H7@P*!LA]50C
-MU'=)8_UU9"QA(Z2H&R'E"BG168;RC=!:A^><92C?""U>_(*S#!5OA)Y[EH$X
-8PK,,Q!&>92"..%6P;SG[!W<O66(`$P``
+M'XL("&`EAE4``VEM9RTQ>#$M-3$R+6=P="YV:&0N;W5T`*V82V_4,!"`[_LK
+M!G$K(CB.[63%":0B<2L(Q*6'YN%4*V!YM(<>\N/Q.'82;^R4;2?KC;+RSI=Y
+M>3PR8^,%H`I0/2@-2N)S*4#MH:P`S*0;W-YS]Q.&]M=1M_>'A\Q=PVZ$Y6PI
+M%8JC/"]`F)>4P&M\B>KP&0:/R5Y>WEX<?MYZ''<X[D"R1*F"@VI6[U%LT@Y)
+MWP[\NT7>S-H5:^UF*?-M!#`!>;[X1^&UNYETG'#"2/6]'244#<I.(_@13"#N
+M;9:M<9*=2"W4C#EU86P,I[:DSL%=[%PLQE0QB5&:NW%=#B7'9Y,VW@^K85+E
+MX>YW_?=.G^C'$ZFB)OWRU5R1-I>[5.'^STX#@>F\92Y8ROTI+I(JS_*>"N5\
+M=(T3F/03W)H?>F]&P5(_E;,-GZ>#D=2O1OV$66=UY)Z>&-YGX6<"-LUY0._!
+M$#<9W+3H/UL'M)XM&I-D=FRQ$1"V\%_3$<>WZ<\#2@EUO0)^]?JU-AP2A`*Q
+MQ\0PQ4'D(#G(.9VM[;)=ZG?YX2-<O?O\!6'7L[DMIHON<`69^MEW)]JM5]ID
+M[B&VV%H^9A_OH\862=R;Z-IM<;$9I=*XV$CCQ);4M)?\1VQ'G&2A5+64JB14
+M9CMJH:N3N!\!CKHN:YQN%)0M;N$RA];NY9W"C0PJLTPJ"^'`3=S-QFYVX0:!
+MP_%3=AQAK[,_KYQ^.G<9$1OIB93W--_*"%3J$7,AQ%'795VA]R29]_8N66(C
+M/9'T7CUZ+^XD5"JV=*==+<M>A+B&UGNY;1_-^C#U>WU/3PQ76?@9@=QM0V3[
+M&G>%E$Q#X8!D&@JW?@DUS,5F,,^-LG)!(:HPB".L,(@CK#"((ZTP""2L,(@C
+MK#"((ZPPB".M,(JV$5*N$6*E#4`!C0[52+8T@P^$;SD\CF^U3QN-4#P8E(V0
+M>JP1ZG726'^=&$O8""GJ1DBY0DITEJ%\([36X2EG&<HW0FQVX#/.,E2\$7KJ
+;60;B",\R$$=XEH$XXE3!OF7W#R':UU\`$P``
 `
 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 025252d30e29..f59ec14fd67b 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("!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``
+M'XL("&$EAE4``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"ME\V.U#`,@._S
+M%$9[6+1HJR9-TO8(TB)Q&V#17KCT)UF-@$%('#C,PV,GZ3:92;HL2FM5&;G^
+M:CMVW:EK=P`(#O60N.85IW=5?)YV-SM+8^/+@/A\<N$,6"'0X294UISNT1J,
+M\5(S:^6,47BWKBVN6H_758";0ZLSR2M"7.5P2[CF94`I81@N@%\6_[C=#@E"
+M@>B!X_TU"`:2@Q1/.!N[G$+_[MY_@/W;3_<$^[J&RQDJS03]#+HE1.P=VPCW
+M/@[7X3CA#/`V&6R3Q5V?9\_A&L+-&[B4Y'%BR\K5T+_MK</).K;J0JM.0L=!
+M33`/6=SW"*<*5YX@]:B@G4!ID`PF0XM9`6/H'[:)ZPD.?(:ZAY8!'PEX.GZL
+MC@YV6_UZX_T3S%=$2O**7/8$WZH(<NJ9<"'&-:6SUU'V9+'L];Y84I)79+,W
+MN.REDT1.I5H7<3YKU:L8-Q;.GB(U]@>^OR^O><5I7\6G`PH/+.:A,&8JV!V$
+M*]@=A"O8'80KVAT$+-@=A"O8'80KV!V$*]H="-1UN2%..*J]&7/>@\0A'E=-
+M?ARC?P^?K6/74;B:;XW^C2&>W@Q=<(@3;G.(&YT/UA]GP18<XH0K.L2E__Q6
+M#2C;7TK2NA6@L*6Z$,C7FK'`Z>=13[\/?\+L$8ZYBD@*V?.&"E.UP`=ZB)II
+M'?AW=?=X<_CQN."XCVI)(-8?6C68L_$B7!F'^W#@WRQROWJ7>$W),'N]@EK0
+M*R8,W'NWCTM%VB^@)5AMH!-D^R31CTB1+&3"V5();_[?O76XTJ6"?PUV?P'7
+':/,?LPT`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
index 69446fd3e64d..831f819746a0 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-512-mbr.vhd.gz
-M'XL(".K%'50``VEM9RTQ>#$M-3$R+6UB<BYV:&0N;W5T`*V735.#,!"&[_T5
-MZWCST$F69*%71ST[XZA7`<'QX,>H!P_\>!-(0@($BZ:E%";9AW<_LDT9&UX`
-ME`&U0`V0U->Y`#I`7@"H07-@?^;F%KKZ[;6IOYZ_]^;5[0889[Y5:*[M,0.A
-M'I(#EOHA]*BOH;.8_>GET]GSRY/%H<'9!PL"@2`51,R>0\RITZ2K\YN+'ODP
-MJLOFZD8K]:D$,`&<>S,RJ^[!:70XH:S:MC]R*,M>ICV"FV!@=':"DVQBY<E<
-M"JKG[!*.UJRVX,YV)A=#J:C"R-59A8Y#COI:E8V-P^Q0I?+]^5Y^?#83?1@I
-M%7+Z^&PLB[N+IE303C8*A"[G-7>AIWQ-<0NE\J_H46@GS(4*`I-V`'OWP^B-
-M*/#U$6<K,8\G(ZJOU/K4VF+EPCD^T)WOP[<#5M4V8,$&A2'..5S5SN%2CAX-
-M13(&$WD\(2=>_*K'Q/FMVFU`*77'F`)OK;XZ=3H:#92Y[KZ2H,!C';Z_O%M:
-M;DUD]?ZQ637X&\X)YL?@,M-*[4R_,N(#W5@FP[?%B35U>@DWFYR5B6NO*29V
-M?IZ!J552`RN\)N,!77YAU'>8R\#`W15],'>WU+@\G,\]'/[B+H2X:C6WZ^I.
-MYNKJQ,EHIROCR)6K(>'*'7"8MA%@WUE4!:I9\W-\H+O>A^\!B.:7(]E/$9K>
-METRA,,!D"H5MIND49FRUV+96(1F%B?;U%&_W?]G7D]?N$^SKR;;[F!7;M*\G
->T^X3[>O)MOLT^WJ-2[JO)_6/C;'=#W^X!V4,#@``
+M'XL("&0EAE4``VEM9RTQ>#$M-3$R+6UB<BYV:&0N;W5T`*V7/6^D,!"&^_T5
+M$UV7`MF#/9#VI/377-(&"$2K*+G3)44*?OS98!L;8[(DWF59D#T/[WQXULO8
+M_`*@$F@`ZH&DOJX$T`U4-8`:-`=.9VYN8>S^O/;=^_FC,*_Q-,,X\ZU"<VV/
+M)0CUD`JPT0^A1WT-H\44/VZ?KL\O3Q:'!H<&)"MM52)0&SV'F%.G2?=G?)Z0
+M#XNZ,E:W6*E/*X`)X-R;45IU#TZCPPEE-0S346E%.C[V"&Z"`8U[+HH8)]G*
+MRI.Y%53/V2T<[5D=P5V?3"[F4E&%4:FS"AV'"O6U*AL;A^A0I?+Q]K?Y]]:O
+M]&&B5,CIX]%8F7873:F@G6P4"%W.>^["1'E?XS9*Y5O1H]!.F`L5!";M`$[N
+MA]%;4.#K(\YV8IY.1E)?H_4)M<Z:C7-Z8/Q9A&\';-MCP)K-"D.<<[CMG,.-
+M7#R:BV0))O)T0JZ\^+6/F?/;#L>`4D+31,#?5E^7.QV]!JKVJ;JO)*CQ4H?O
+M;^^VEEN?6+U?;%8]?H9S@ODEN-*T4CO3KXSTP+B4R?QM<6)/G5["_2%G9>;:
+MZ^N5G9]G8&J5=,!JK\EX0)=?6/3=Q#(P<'=''\3N-AI7A?.YA\-/W(40U^[F
+M=E_=5:RNRYR,8;TR+ERY&A*NW!F'>1L!3IU%5:":%9_3`^.O(GS/0#2_'-E^
+MBM#TOFP*A0%F4RAL,\VGL&2[Q7:T"LDHS+2OIW2[_\J^GKQVGV%?3[;=IZS8
+BH7T]F7:?:5]/MMWGV==K7-9]/:E_;(R=_@,`JJ]S#`X`````
 `
 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 c93aec151c4c..609685deb416 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(""(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_"```
+M'XL("&4EAE4``VEM9RTQ>#$M-3$R+6UB<BYV:&1F+F]U=`"ME;UR@S`,@/<\
+MA7+=,G"VL`Q9>Y<]2]L9".1RO;1+APX\?&6,P<:!)#U`(<[)^B)9/PAA+P"%
+M((H;SWE%^YJ$=[O9;3J:+)\#Y@*:)@(F#+2XBG&\@:6@?L$B)!C'^<,B!:#L
+MUU:@3<9KFWBXTV`5R[S"QR46Y\)MG@,205%$P#?G'ZZ=#F6`E($B(`TY/AKP
+MQ^%]$K#%R;7.S^+P'FYP6#Z"2XV5M].OC'E%.Y:)_78XM>0=(T3]5+"T<NVI
+M?&+GYQD$=TD%(N]U&`*'_,+HWSYV`X-P%_R#.-S"X+)PO_1P>"=<"''E8FZ7
+MO=O&WE4K)X.FG?%@YQI(V+D6A^L.`NPF"U<@[XJ?\XKVF(2W!:H>N-H)4O\J
+MTBGH!G0-FLPZ4Z#WD.4^$,-*:JOOK[KZN?SZ&38X.;PY8C'VF)INT1E@8?Y$
+MG\S:\^_E<-Y=KF>'<Z/*321N-K9*$709A4N39KO@9X<\CMZE\2&1?WI[#4*!
+ME$'@O7?'L)RIF_,NV+J!4G7GXR3X$2ANCBJ#(S&Q^F]N+4ZO7"I<>YL_P54P
+%QK\(````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
index 01016a55890e..73e06370351b 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-1x1-512-pc98.vhd.gz
-M'XL(".O%'50``VEM9RTQ>#$M-3$R+7!C.3@N=FAD+F]U=`"METUO@S`,AN_]
-M%:YVZZ%*C!/:Z[3N/&G:=BUEM-IA'UI[Z($?OQ@22/A:NP4H"@I^\MIQ3"I$
-M?0#H!/0>=`%:<3LET&M(5P"FTUY8W:5]A#+__"CRT]MY:8]R5L.D\*U"<[;'
-M!,@,D@)F/(A^Y3:4#K.\V1P6;^\'AT.+<P.3!D)0!D*]<;1HU#'I_O;QKD)N
-M6W5)7UUK97X[`D$@I?=&XM1M&XT-CHS5?E]=*619)=-=P4/0T3K;P2G1L?)D
-M#@75<W8(IZ>LKL$M9G8NZE0QB9&:NPF=A!2Y;=+&Q:%WF50Y'[^R[V/1T8<C
-MJ:(;?;+7EXR[BS95T+UL%1"G\Y2[4%%.7=Q`JOPK>CJT(]LP01#*=6#E?AB]
-M%@6^/BW%1,S')V-47\;ZS-H2V<!]O*.\789G`]SMKP,JQ4NH"WQR#N>L;TV0
-MTU#<?2<O6AWY2/;]>7Z+R/'#RF&5<KE4&E9XJ<*7S?.`PQC/X1J'O^$:P?(2
-M7&)KGWO3J,7F:S/:4>/FEC5O<32ECM=<<96S*FZR8+[JV/GS#,+D<`YBY54%
-M#]C,+[3ZUGT9&+@[H0_Z[F:,2\/WI8?#7]R%$+>;G-MI=?.^NCSR9+QV5\:%
-M*Y<AX<JM<1BW$%!5F4T&<HWLW<<[RH=E>-9`M*4^VK<#;6V.II`L,)I"LM4Y
-MHD(J)I/MVBS45F&DC3CC(F[$&1=Q(\ZXB!MQQD7<B#,NXD:<<5$WXMK\Q1)B
-*]@,_NS;^O0T`````
+M'XL("&DEAE4``VEM9RTQ>#$M-3$R+7!C.3@N=FAD+F]U=`"METUO@S`,AN_]
+M%:YVZP$E)H3V.FGW7;9=1RF=JFD?6GOH@1\_&Q)("-!V"Z0H*/CAM>.85(CV
+M`-`IZ#WH"G3&_5R!WD"^!J!!T["Y2G,+=?GU696GPSDQ1[UH85*X5KXYVV,*
+MBEZ2`Q;\$KWC/M06D]P]O*T.'V\6AP:'!I3E;)4BZ&WP'BTZ=4QZ.>![@WSM
+MU:6ANMZ*?EL%0H&4SA.I5??::>QPBJSV^Z;EK(CC8YMWXPTP[CU)0EPF!E:.
+MS+&@.LZ.X?2<U2VXU<+,19LJE!@Y72ET$G+D/J6-C4/0*%7.Q^_BYU@-].%$
+MJNA.GPS&TFEWT:0*VH>-`L7I/.<N-)33$#>2*O^*GO;ME.E0$$1F![!QWX]>
+MCP)7GY9B)N;3DS&IKV!]BM99,7*='JCO$__L@-O];<`L@R($/EF'2]:W45"J
+ML;B[3EZU.LJ)[/OS_%:1XX>-PU3OJ%QF&M9XK<*7A^<1AS&>PRT.+^$ZP?(:
+M7&IJGWV2U&+WM9D<:'%+PUKV.#6GCM=<=9.S6=QDP7(]L'/G&03E<`EB[50%
+M!]C-+_3Z-J$,]-R=T0>ANP7C<O]YZ>#P@KO@X[:S<SNO;AFJ*R-/QFZX,JY<
+MN0SQ5VZ+P[B%0#65F3*0:V1PG1ZH'Q/_;(%H2GVT;P>:VAQ-H3+`:`J5J<X1
+M%:IJ-MENS4)M%$;:B#,NXD:<<1$WXHR+N!%G7,2-..,B;L09%W4CKNDOEA"+
+)7SQ_K7"]#0``
 `
 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 b234c5ecb37c..ba3cfda16a56 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(""<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`(````
+M'XL("&HEAE4``VEM9RTQ>#$M-3$R+7!C.3@N=FAD9BYO=70`K94];X,P$(;W
+M_(J+NF6([,,VL%;*GJ7M#!2BJ&J[=.C`CZ]M3/#90$AEL)"CXYZ\Y_N`L>$"
+M$`BLFGDN&_KG([W[W6%G:;Q[#"@E5#'P10,M#HV^4D`C0.^"!5TW+6+HC\$U
+MXK@VQB#GM6B8P;EP1>+S0QNPS$%(D`H*W*KP[?0Z$S"F"WC`X3W<33#?@LN,
+ME_>F5HO\AELR#+B]8^TGG%A3IQ&L?2A8F;98$(O`S\\S,%W##;#"V9`";_F%
+M25\9RT`2[HH^B,.M#"ZG[W,/AW?"!8JK5W.[KFX?JVL2)R,+.V-CYQH([=P!
+MAVD'@;"365>@F9'1<]G0GX_T'H#"`9.=H'3?#I6!ZD"UH*39YP)4"7GA`Y%6
+M4M]\?[7-S_77S[#!\6"B^\OX8V:Z1>6`E?D3]6[VGKZGT^5P_;R,N'%4C1-)
+M-YOVRA!4'84K@V:[XH=%GB=U67Q(TC^]4@$3P#D)W*D[TW*6-K]CL&T'M;#G
+A,R[R@QAF1Y7!219X_3>W`TXE+A7]5=O]`1)P9+AP"```
 `
 end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
index e3f9594789d8..a1c781c1c93c 100644
--- a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
@@ -1,17 +1,17 @@
 # $FreeBSD$
 begin 644 img-1x1-512-vtoc8.vhd.gz
-M'XL(".S%'50``VEM9RTQ>#$M-3$R+79T;V,X+G9H9"YO=70`K9;);L(P$(;O
-M/,5(O7%`WN+`M6JY5:K4%\!)'-1#%P$'#CQ\9Q)G<1('*`[&,G+F\S_CL1G&
-MZ@=`2]`E:`LZH7&J0&\@70/@I&NBZKG["9?\Y]OFI\_SRCV710WCK&_EFY.]
-MD*!PD12$H45T06.X-)C5T^M^^?FU;W#"X9J%E08E($&(&JVC6:N.2-OGCY<*
-MN>O4R;&ZS@J_F0*F@//>&[)1MVLUMCB%5F59M12,J60VS?OA373.#G`)&UCU
-M9$X%M>?L%$[/6=V#6R[<7M2I@HF18H^AXY`*&F/:-'$8-4R5\_'7'(YVH$\$
-M4D6W^OAH3H;=%2Y51/.R4Z`HG>?<A8IR&N(F4N6AZ&G?3KD!!H$ES82HW/>C
-MUZ&@KT]S-A/S\&8$]1G2A\<+=Y1N@:0[9U+C1!%R>'NP%D^:?O/C9P*[^^_X
-MF;5G=^5TK(%MZ-8)IHO9=%:;QP^;,;'<K7'9K3BZO@HH+%@[P.UZN#SR9F0C
-M=RUELKP-R(;N9N2N'+S/71_`T47*1OIJ7.>NZ)D(#S>Z7$@=M,>LCRM:W%#C
-M%6?9I#H;-56R\E9<82"S("7(9(23B</E9(5_1,Q,].&)R_O*_]2I(MR]$NVB
-M$K$5*@>,IA"!-K)"SF8SX][SJYW"2%4?X2)6?82+6/41+F+51[B(51_A(E9]
-1A(M:]>DJ]Q9_[Z\6^RH,````
+M'XL("&PEAE4``VEM9RTQ>#$M-3$R+79T;V,X+G9H9"YO=70`K99-;^,@$(;O
+M^14C]=:#!0,>)]>JW=M**_70:W!,JJC:;=7DT$-^_#(V_L"8-&UQ,,+"\_B=
+M89@@1'<!D`+:`UF@DL>5!MI`M09PD[YAVTO_".?=ZS^[.QT^"G^=5QU,BJE5
+M:,[VJ$"[CU2`AC]"#8_AW&.*FX?GV\/?YQZ''H<>5%9LI1"HCKY#8E#'I*<#
+MOK3([:A.Q>I&*W?7&H0&*2=OJ%[==M`XX+2SVN_;5K$BCD_?@H=@@G$O11'C
+M2C&SFLA<"NK$V24<7;+Z"NYVY=>B2Q67&)7K7>@D5,ACES9]'*+F4N7C^&;>
+MCW:F#Q.I0H,^&<VIM+OH4P7[E[T"S>E\R5UH*:<Y;B%5?A0]"NVT'[@@B+*?
+MP-;],'HC"J;Z2(H+,4\O1E*?87V:>$6Y"I2@$4JW634H<A--RN%?[];>/=[3
+M[S!^)K&ZWXZ?60=VG^R.-8@-5XUDNIC-:+7Y^68S)I>[':Z^%L?EJX'&@K4S
+MW':"VV5>C#IRUW(FJ^N`8NYNS>ZJV?O2]PD<%U(1Z>MPH[LX,<$`%Q475@?#
+M-IOBF@$WU_B)LV)1G<V:*O7^6EQCH+:@%*@RPJG2XW9LY?Z(A%GHTQ/G/T7X
+MZU(%?5W)5J@PMT+M@=D4.J#-K%"*BYGQU?U+7F&F4Q_C,I[Z&)?QU,>XC*<^
+:QF4\]3$NXZF/<5E/?=3FWNH_$"6H@RH,````
 `
 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 bc89e34ee4ca..ea456e462fad 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(""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&````
+M'XL("&TEAE4``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V43TO#,!C&
+M[_L4#W@9$TK^M[V*>A,&'KS:KND80P7QX"$?WF3);--D=4C3M+2\?7YYG^3E
+M)<0/0"B4#$JZ*1@DAQ#@T@8ZV'@Z81X_M;Y[OI=/A1]FY6'4!K,2,A<PQ628
+MU28`JTA'YX$52`W"LD"/JP=5_2=N+C^/:Y:RZW'MM3AEGQTZ#:TGN-<1;K?P
+M8=#$KH8]<%9=!5Q/[5)GUXNG)TPOX6S`K)/\/&ZPRT82%N%H+CL4_HYQW8"K
+M$M6<V74V.[UHJ=#^6ES7H-5@+;A*<+<JX)A32?M_DWE>#IAM$5^^5$0`+E9[
+M,C0JQ:%Z*'WJ51RE@*I15F,@BXX99O?QKG=?A^_Q_LG0J/H^/YV>V29H%RG!
+M&K>(ZMS[*+^;A_WF\+8_XUAPQ<+"LG0J;KMJF]B5L=V7`SN>D-LA.YYNDASO
+M7JU`!"B-C(?LMG&Q.)SX-:M[M.*T/^<9?42!;.TYG"03U?]+V>'4PJ5B:V_U
+)`_KO!\'=!@``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
index 03492316e6ac..883c81f9d41d 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-apm.vhd.gz
-M'XL("/_%'50``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4
-M?<^ON-+>*BT"#-?=T]1JS=ND:M6>6\O!5:2UC9I(ZX-__+A\U#@&U\UP$,'"
-M]W`X]P,8<P\`5H`=H`94-*XEX#>H+P',I&_"]MR_0M^^/.OVN'M;^Z=?.3#.
-M8JNQ.=F+"J19I`;1T"*XI3'T`6;]Y>;Q8O?T&."$APL+2P0I0!D0.5D'V3L[
-M0MI<W_VPD`\#NVK*;K!R?UT'51=]405V#[;_'F]6&BOS/;4:*F5IAC9Z&4T0
-MG%I'3X!3[,0JHID2-=IL"@[GK#X#=['ROG"A8@*C-KV1CD,M:&S")N@P:294
-MW@[[YO6@3_B)3*C@.S\^F:ORVQ4^5$3XV#.0%,YSVP6+<CR%2X3*?ZF'8SOI
-M!T8$IL*$L-L?JS=`0<P/.9O1/.^,++^&^)G45"(DNVW51QN^^44P[-0=3<:[
-M9^O7TK3)$+E-1<7PPL<3_>W/9+BTQ$]R"F.*Y)9B>`F_J_W^CT[`B5+;=7#5
-ME)WJ?,[9I',EVO:N=*LNL+LWV7;<'7<OS_<!C@H5E5J+N)S=4[-/LE.%?:L7
-M^O8RRA,V\2T$?KIT[&GK#B3AZ814PQDDMH:XHCGS/@'<O&IM3J&OOS=WL7Y:
-MEN7'V0+]1*2?2Y)8O[BV\-PA?CZ_6?WH,*D3L3GH=_CK`C'P*ZU?X_5C3:+/
-M3_2WZ_'/`0I?3(M59S%4OS(,I0<LQE`..5R*(=>SSORLE]$S+'35Q7R5.>>J
-J2W`%K[KH2U;6ROTMO>JB+UF%KKH$5_"J2W!%K[IH"^KJ'[J1;&,?#0``
+M'XL("*@EAE4``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD+F]U=`"M5LMNW"`4
+MW<]77*F[2!W!->!T535JLJL4-:JZ3%P/CJPTR2@S4K/PQY?+(\8/7&?*#,(@
+M?(\/YSZ`,?<#4`6H!I0&)6E<"E"?H#P',(N^H>VYGT)7/S_I^MB^;OVOVS@P
+MSF*KH3G98P'"?*0$K.@C:D=CZ`+,]L/E_5G[>!_@T,.A!Y(E614(ZM?D.XJ]
+ML2.DGRT^6,B[GETQ9==;N4?30-%$;Q2!W9WM/\>;%<;*O$]-42-]0AM,!@O]
+M9D?:23:RBFC.B1IM=@Y.+5F]!^YLXWWA0L4$1FEZ(QV'$FELPB;H,&DF5%X/
+M^^KEH$?\,!$JZHT?GZP5Z>VB#Q4,+WL&@L)Y:;M@48YCN)E0^2_UU-!.^($1
+M@<FP@';[0_5Z*(CY*<X6-$\[(\FO(GXF-27VV69:\:\-7WXG&#9V1Y7P[LGZ
+MU;1L,D3LYJ*BG_#A0G?];39<:N(G.(4Q17)-,;R&WY?]_K>>@<-<VW5PQ92=
+M;'S.V:1S)=KVKG3+)K"[-=EV;(_M\]-M@*-"1:76(JYG]UCM9]G)S+[5*WU[
+M'N4)F_@6`C^=._:T=8<BX>F$E"`0I#G(!.#.$)>T9N83P*L7K2]NOG[\<743
+MZZ=%7GZ<K=`/(_U<DL3ZQ;6%IP[QT_DMZD>'23D3F[U^AS\N$`._W/I57C]6
+MS?3IA>YZ._P[0/3%-%MUQK[ZY6$H/&`VAJ+/X5P,N5YTYGN]K#S#3%==E:XR
+MIUQU"2[C55?YDI6T<H^U5UWE2U:FJR[!9;SJ$ES6JZZR!77S%RXBXYX?#0``
 `
 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 6892f0a9e061..a48dd82b208d 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("&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@<`````
+M'XL("*DEAE4``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD9BYO=70`K57+:L,P
+M$+SG*Q9Z"]3(>KJG/FAR*X2&TF-P;3F8-HE)`^W!'U_)DAK)=D):)"]"8KW#
+M[*RT0L@,`,J`84#*D#7:S<=]SZ"=/2=JW"5NM!,#EIZ+.@V7]$8[F1I`K-U,
+M$2H'<<0'3$-'NWCJ`QHXS8^F()`V7@!G%_&[;YH/.0*'8Z5KX,B0':NZ=0H@
+M,`@*_,;.O`(NM=NR6S7Y_E`?ZMUVY>!4%8&7.EC\A=TF;T;9L<BUI1?6-K,+
+M;`'#VH+C1V.?/=J5@VOA52&440R,`*6`2T6<:9_:#P#G>RD?EH_7+_.EKQ^E
+MD?GQ"_3#GG[FDOCZ@<^/Q]:/G]5/$!!BY&P>]?O\,@?1\8NL7XJL?B@?F4\[
+MVD42?@:06L!H##/;G3FQ=UV+2%P/R'Q`?"QO!UCLMK(XU-_^#<YL=ZZJ<=/Q
+MF.BW@`O`>==B2KWV^%W-UM-ZLW9PKONYAX,)'454N=\&Z69ANJ\U?N^S(T.1
+MLD"]5/,D59!XH-ZM#T=_DY42"J./LV`3.$9[LX;KNI__\W]K:^!XY*.B'LK)
+)#UU>%[W2!P``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
index 9e1039688b42..1f4a1b9e1fcf 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
@@ -1,17 +1,17 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-bsd.vhd.gz
-M'XL("`#&'50``VEM9RTV,W@R-34M-#`Y-BUB<V0N=FAD+F]U=`"MESUOPR`0
-MAO?\BI.Z9;#P&6-W::*HZ5RI4CN[Q(XR]$--APS^\>5LB`]_)6VQ"<*">WB/
-M.Q`1HGT`5`*J`E6"2JF=25"WD.4`IM,6;.K8?D*M/]Y+_7TX1?:I%RTL%MS*
-M-R=[3$":23+`@B91.VI#[3#1S7:_/+SM'0XMSDTL%4B$U$#D8)Y<G-41Z6'S
-M=-]7EPS5=5;M/%4%2<5&)%Q=%*TX3AHK,YZ*@DHV,EWQ/KP.CO/4I:)GQ62.
-M+2IS=@RGYJQ^@ULN;"S:5#&)D9E:@(HA0VJ;M''K,"@F54['S^+K6/;TX42J
-M*!:,?I^<=A=MJJ`;;!5($CCG+C248Q\WDBK_6CWEVTG;,(L@4M>!C?O^ZG4H
-MX/I4+&;6?#H8D_H*TF?VEBA&ZNF.>A/Y[QFH"9AFM-U3!3E>NX(OV^>Q^.J)
-M=/GC[M!X"><$\]/`QZT8+FG#T5%8\H*.(2F[;SF"NS._=8>3<^HH9\JQCDEG
-MT\#)K/.>'8\SQ"7$"8B<934#GN,+G;[;H0STW)W1!T-W"\)E_OB8X?""N^#C
-M7NVYS`9W(;RP>NNA.ATX&+O^SKARYQ+$W[DM#L,>!-B<+"8#S:AA/=U1/T;^
-MVP+1'E7!SCYT1U4HA=("@RDTP#*P0BQGD^VW6:BLPD`72<(%O$@2+N!%DG`!
->+Y*$"WB1)%S`BR3A@EXDE?F+(,3B!S97<<M]#```
+M'XL("*PEAE4``VEM9RTV,W@R-34M-#`Y-BUB<V0N=FAD+F]U=`"MESMO@S`0
+MQ_=\BI.Z=4#F;`Q=FJA2]T[M3`A$4=6'F@X=^/"]`Q/.O)*T!F(9V??C?P];
+MCE+M!6`UV`IL"3;A?FK`WD&:`="@>[!I8_<*=?'Q7A;?AY_(7?6JA<5*6OGF
+M;(\:#'TD!<SY(W;'?:@[3'3SN+\]O.T['#H<.E"2LI5&L-O1=S)U4L>DEP.^
+M#M7IL;K>JG6PJD!78H:6ZJ)H+7&&K&@^/Q:V21.?[O%>O`&)\]0E:F`E9$X%
+M53@[A;-+5M?@;E<N%VVI4&&DU"JP,:3(?2J;+@ZCATKEY_B9?QW+@3Z<*14K
+MDC$<,_/NHBL5["8[!88%+KD+#>4XQ$V4RK^B9WT[XSH4!)5T`]BX[T>O1X'4
+M9V.U$//Y9,SJRUF?H7663[3S`_5#Y-\G8,%`6J^TW!,+&5X:P9?'YZG\%C/E
+M\L?54>`Y7"=8[@8^;BUPNDU'3Q'%"T4,NNS?S03NGGZ;'F>6U''-E%,#L\XF
+M@8NYR`9V,L\0EQ!K4)FH:@$\Y1=Z?7=C&>BYNZ`/QN[FC$O]^;'`X1EWP<=M
+MW;XL)O<I/!.]S5A=$3@9N^'*N'#E,L1?N2T.PVX$V.PL5($T:]S.#]1/D7^W
+M0'1;5;"]#[NM*I1"XX#!%!*P#*P0R\5BN[8*K5,8Z"#)N(`'2<8%/$@R+N!!
+=DG$!#Y*,"WB09%S0@Z2EOPA*K7X!<\?WIGT,````
 `
 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 7bd9f318288d..5983e579af85 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("&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``
+M'XL("*PEAE4``VEM9RTV,W@R-34M-#`Y-BUB<V0N=FAD9BYO=70`K90[;\,@
+M$(!W_XJ3NF6PX'B8+$U4*7NG=G9<'$55VZ5#!WY\(38Q9_RH*@.VC([[?`_N
+M&.L&@$1@]<1[7N">2CI=L2MN-`Q`58%4H#08?YP-BVR(P+V>7LITN!['E[3F
+M<>5H1!RNX:+!HIW#'1*<\,(V.<EXHM5P$';8RPG<HW^.`TXN6><CP>R48-99
+MM57L8F[-2"_-,W`+7``SO0PI\)Y?&.S;YV8@<7?!/LC=K0.NHN=Y@L,5=X'B
+MS@''R>$AA2O1.^;6-1LG0XPKXX^5&R"T<CL<;ML(\-99_`WTI_+WO,`]EW1V
+M0-D#-XN@Z7N?%J!;T!:T"M^5!+V'RJ1`I#?)-5^?MOF^_J09#CC>-8/)%?11
+MA&K1%6`=?J+?PG=BW\/ILKM^7"(NMJK8D7RQ>2V!H,^9NV94;%=\'ULG\B`9
+M$CT>[$S;GO\SB=XAQ<F[L]9"T\4G+K(A@LE6%7"*C;3^F]L.IS>^*O[R%;]:
+',:4),`<`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
index 4a2ad29f823b..e6addcc9e9d9 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-ebr.vhd.gz
-M'XL("%_N+50``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD+F]U=`"METUOXR`0
-MAN_Y%2/UUH.%QX#=2R)5S9Y7JMJ>L6M7/>R'FCWDX!^_C(%D\%>:EI@@K&$>
-MWH$!"R'<#T`7H#O0+6A%[5*"OH.R`K!&7W"H<_\*??/G=]O\>S]F_M=O'"P7
-MW"MV)W\L0-I!2D!#@^A7:D,?,-G-_NWV_==;P*''A8&E!HF@+$1.QJG$21V1
-M?MP_/HS5%5-U9R\W3M=!T;$>!5>793N.D];+]J>BH9.#S%"BE\C`<9$Z)49>
-M3.;<I+)@YW!ZS>L:W.W&KX5+%9L8I:T%Z!Q*I+9-FS`/DV)3Y7CX:SX.[4@?
-M+J2*9HLQMLGE<-&G"H;.7H$D@6OAPD`YC'$SJ?*MV=.QG_0-.PE"!0,.X<>S
-M=T8!UZ=SL3+GRXNQJ,^LQO6%@.OZ>N#*[J@;OSL$&$4U[=+<[U7OW]CW=D;?
-MSFW;+<>]I@ZWNPZH%!@S`3X%?4WBY:@J,MNS4YB9>MG0WV?Q<P(.":-*.LZ5
-MA@H_J_!E_SRSOI59.`ZN#]CA\!(N".:G?8S;,5SAMAM/U;,7SSO>9KBM^P><
-M7%-'9T([9U@,5B5.%E.-_/@Z0]Y"7H"HO`UCX&E]X:SO;BH#HW!7],$T7$.X
-M,NZ?,QQ>"!=B7'TZ66:6\,+L;:?JFL2+48]WQB=W+D'BG>MPF/8@,,/)8C/0
-M]IK6RX;^9Q8_#HC^4Y3LVX;^,$VF4'I@,H46V"96:-)^/[17F.BB0+B$%P7"
-D);PH$"[A18%P"2\*A$MX42!<THN"ME=`(3;_`?39ZI==#@``
+M'XL("+`EAE4``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD+F]U=`"MESUOXS`,
+MAO?\"@*W=3!D6I+=)0$*=+_EFEEV["(H^H'FA@[^\2=:4D+Y*TU/L2/(H/CX
+MI431D!#N!Z`+T!WH%K2B?BE!WT-9`5BCOW%H<_\(??/^UC9_CU^9__4;!\L%
+M]XK=R1\+D/8E):"AE^@#]:$/F.S7X_/=\?4YX-#CT(-425X%@JXG[ZG$61V1
+M]D=\&:LKINHN7B[`KH.B8R,*KB[+=APGK9<=3[>&6@WS$^[H(3)P7*1.B9$7
+MDSDWJ2S8.9Q>\[H%=[?Q:^%2Q29&:5L!.H<2J6_3)LS#Y+:I\G7Z,)^G=J0/
+M%U)%L\48V^1RN.A3!<-@KT"2P+5P8:"<QKB95/FOV=.QG_0=.PE"!0,.X<>S
+M=T$!UZ=SL3+GRXNQJ,^LQO6#@.OZ=N#*[J@;OSL$&$4M[=+<[U7OW]CG=D;?
+MSFW;+<<=4H?;W094"HR9`/\$?4WBY:@J,DM;1\U,NVSH'[+X.@.'A+'UV)9S
+MI:'"[RK</S[-K&]E%LK![0$['%[#!<&\VL>X'<,5;KOQ5+UX\;SC?8;;NG_`
+MR35U5!/:.<-BL"IQLIAJY,?7&?(6\@)$Y6T8`\_K"Q=]]U,9&(6[H@^FX1K"
+ME?'XG.'P2K@0X^IS99E9PBNSMYVJ:Q(O1CW>&=_<N02)=Z[#8=I"8(;*8C/0
+MCIJVRX;^=Q9?#HC^4Y3LVX:^F"93*#TPF4(+;!,K-&F_']HK3'10(%S"@P+A
+C$AX4")?PH$"XA`<%PB4\*!`NZ4%!VR.@$)M_4*:1%ET.````
 `
 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 04e8499dc36f..604b289cf244 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("&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`)````
+M'XL("+$EAE4``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD9BYO=70`K94[;\,@
+M$(#W_(J3NF6(X##861RI4O8N;6;;P5%4M5TZ=/"/+V>""QCG46$P@AQ\N1=G
+MQNP#8-YD7Q8,F^@95NO52./MXT">!%I<1Z<X;6LDC:*G)8T3KC-KG=!O9YIY
+M:A]WS&UN_QA02FB:&?#5Z8>9PU%J$A<(K$F,RX+A>1,V!ZS&A)$E%!*D@@KO
+MU?"P?TO$MV(\E\$6A[=P3F&;02G<SL,)(^R]G383+Z?\O//G'JZVK\,5U[0S
+MGF`Z)5@T5N9-ELJT\)P?9^`:N`!67608`J?XPI]^V[D:&)A[13^8F]L0K@SW
+M<P^'-\R%$-=.E241PAO>J^?:=9F#P>.;<>?-)4AX<RT.\Q:"[5A93`::7?-Q
+M63"\;,)F@<4%F,N#W'W;E`#5@]*@),W+`M06RLH'8IA)0_?UJ;OO\X\7X1''
+M;3%(=CJ/@FZ+*@$;^A-UI+FGW]/^M#Y_G!S.E2I7D<QE,Z<$@FHC<WEL[N&,
+M[[%V(G82C[R'I*=?]LPO@?=V/JZ8C-4]M,<1YWJP"`2I4C7B)(M._3>V%J<R
+/IXKY[JY^`1U?D=P0"0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
index 0dfa2d8094ba..f47328c7e60f 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
@@ -1,22 +1,22 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-gpt.vhd.gz
-M'XL("`+&'50``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD+F]U=`"MF#MOW#`,
-M@/?[%2RZI:ACR9+L6UHT:`)T2U];A_@A!QEZ?5R&#/[Q%67Y(5MRX81W@LZ&
-MS,\D15$\I6G_`5`9J!:4!B7Q.A>@CI`7`&;0-6Y[YFZAJW^==/WX\)2X3W?H
-M82R=2_GB*,\S$.8E.?`27Z(:O(9NP"2OK^\O'G[>#SCN<,.+A0+!01J(6+U'
-MI:-V2+JY^OK1(N\F[;*U=I-4_].VD+6S)[)!NSO;OY\;*XR4>1Y;#JF$5$S-
-MN_$&)F,7OI/I0FJF9LBI,V-#.+4EM0=W<7!ST8>*"8S<],9U#'*.UR9L!C^L
-MF@F5I_/O\N]9+_3CD5!1HWYL-9;%S>4N5/CPL--`8#AOF0N6\KC$!4+E1=Y3
-MOMPPN\8))G#<#;?F^]Z;4##73[%TP^?QR8CJ5Z)^9FVE9:"/#W17B?\=@56U
-M#SAXT,>-!E<U^L_F$:TGB_H@F1R;;4Q(.O-?U1#/;]7N`TH)9;D"?A_TJ^UT
-M2)OPCA@8)CD(!M(DORF<K>VRGNMW??,);C]\^8:P'Y.Y-89+PZ&HH3Y"6RVT
-M6Z^T[=Q2\S[Z>!LT-HOB+L,X7&QMLX$+M3A.;$FYK6R'L3+UI8JY5*:ARJ`M
-MH6PBN'<+''5>UCA<*<AKW,(E@]KNY8T"Q@`*LTP*"^'`C8IF8S>[<(7`[O0Y
-M.?6PM\F?-TX_S5Q$A%I\(.8];?-R$3,WGQ)VQ%SP<=1Y61?H/4GFO:,+EE"+
-M#T2]5_;>"SL)O1=:NN.NEB2O?%Q%ZSUF=PVS/DS^7O?Q@>XV\;\]D+MMB&Q?
-MXRZ1DFDH')!,0^'6+Z&&3&].YMY95FY2B#(,X@@S#.((,PSB2#,,`@DS#.((
-M,PSB"#,,XD@SC*(MA)0KA+("-,,_+I4?-?&2IBN2<Z_8I6>N+82BY=-&(12>
-M#,I"2/VO$&IUS-B1LS"6L!!2U(60<HF4Z"Q##8706H?GG&6HH1":O?@%9QDJ
-@7`@]]RP#<81G&8@C/,M`''&H,%.['/X!4B?R+P`3````
+M'XL("+0EAE4``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD+F]U=`"M6$UOU#`0
+MO?=7#.)61!H[\21[`8%4)&X%@7KAT"3K5"O$\K$]])`?C\=Q/IS8@6UGUTJS
+M<N;ES9OQ>.HT[3\`F`&V@!I0T7V1`^Z@*`',I!O27H7["5WS\ZB;A\-CXC[=
+M10\FTKF5;T[V,H/<O*0`6=%+<$_WT`TPR<OK^\O#C_L!3CHXZ8!405:9!*Q7
+M[\%T9$=(MP?YW4+>3>RR-;O)JO_3MI"ULR>R@=V=O;Z=.YL;*_,\#80&(<VG
+MX?WP)B9G%]JI=&$UHQD2=>9L"`ZWK,Z!N[QPL>A3Q21&8:Y&.@&%I'N3-H,.
+MJV%2Y?'TJ_IST@M^,I(J./(3J[DL[JYTJ2*'AQV#G-)YRUVP*`]+N$"J/$L]
+M].V&Z!H14C5,2.N^K]X$!7-^*-(-S>/!B/*KB%]NUED5N,8GNO>)_QT!Z_H\
+MP$%!'VYTN&Y(/UL'M)X\ZI-D$C;;"$@ZTZ_>,\>W;L\#5`JJ:@7X=>#7V'`H
+MR!'R'26&*0ZY`"5!3>EL?5?-G-_UAX]P\^[S%P+[-KG;4+KL)90--#MHZP6[
+M]4K;KBV-[+-/MD%GLRC<51B.%EN[WX`+C3A<OF4U[B7_[:Q*?:MR;I5IJ#-H
+M*ZCV$;@W"SCNNJQIND8H&MK"E8#&[N5[!"$`2K-,2@LB01J*9F,WNW!-@-WQ
+M4W+LP5XGOU\Y?EJXC`B-^$1,/6WK<AESMY@*=L1=\.&XZ[(N23W%IM[.)4MH
+MQ">BZE6]>F&12+W0TAUWM21YX</5O.H)NVN8]6'J]_H:G^AN$O_;`TJW#;'M
+M:](54C:&N0-D8YB[]<O(4.C-8)X;971!8:HP!,=880B.L<(0'&N%(4#&"D-P
+MC!6&X!@K#,&Q5ACD;830-4)9"5K0/RZUGS7QEJ8KDU-/[,ISUS9"T?9IHQ$*
+M!X.S$<)_-4*MCCD[XBR<96R$D+L10E=(F<XR<&B$UAR><I:!0R.43@(^XRP#
+APXW04\\R"([Q+(/@&,\R"(XY583I72[^`K`XWC\`$P``
 `
 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 6cc070dd59a5..b4467830b4f5 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,18 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-gpt.vhdf.gz
-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``
+M'XL("+4EAE4``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD9BYO=70`K9?-K],P
+M#,#O^RN,N#U$E.]F%P9(#XG;`X&X<.GGTX080G#@L#\>.^E>DRZI&,IJ59U<
+M_VH[=MQR'GX`6@)O,^>RXOR6I<=Y=[?S--'=!L3GDPLK($-@P/6HY)+N&4>8
+MIEFX\%;!&$7SY=KCV/)[S2+<$%NMI*R(<2S@+N%.MP&-@;:]`GZ^^"?]<AC0
+M%O0>)-Z/L0DP$HQ^POG831_[=__N/3R\^?B)8%^7<*5`92>@L]`::-3*.[$1
+M[J\TW(!#ARC[:LH&JXJXPSI[`:<(-VS@<E+&Z2VK4$/_MK8!9WAJY6(K-4*G
+M8&JA'0JX5RN<K5QYFM2XL$T/=@0CH)_H8K`@!(##-G$>(D&BBWMH!,B.@.?3
+M!W8*L)?LYXO9/RWFBLA)65'*GJ92X:X4;D.UO1DNI#A5.WN.LF>J96\_%TM.
+MRHIB]MJ0O7R2*'NYUD7<G#7V+,5U=;,G_-3`_L#]^_I<5IP?6'H$H)Z!U3QL
+MIJFOV!V$J]@=A*O8'82KVAT$K-@=A*O8'82KV!V$J]H="!QYO2%..*J]?@\]
+MYKR#+JV:\CA>_#LDX8YR:_1O#/'\8HP5ASCA-H?X--X:;,4A3KBJ0]S-K]]6
+M@?7]90U=-QHLMI2+@7*I&0_L?YS&_O?Q3YP]YW=F6%Z25T+V4E%A6FR1EAYB
+M![J._'M^_WAW_/YXP<DYJDL"34-62H+MKL)U:;A?CO+;VKO,-N62[(FK<EYM
+M`X<8IY^"Q4\#W&*X7B3YDRBRA4PX7RKQS?^[M@%7NU3PTV#W%T[=6[ZS#0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
index 695a3e982aa6..e6996d15b4b6 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-mbr.vhd.gz
-M'XL("&+N+50``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD+F]U=`"METMOW"`0
-MQ^_[*4;J+0<+CP&3RZX4-3U7JMJ>L6-'.?2A;@\Y^,.7,>`%OS;;S)I%6,"/
-M/\S#0@C_`]`5Z!YT!UI1NY:@[Z$V`*XS%!SK,KS"T/[ZV;5_7UZ+\!L.'E:*
-M=%8^G>9C!=(M4@-:6D0_41N&B"D^/#[?O?QXCC@,N+BPU"`1E(/(Q3I&3.J(
-M].GAR\>YNFJI[C++K]/W4/7)B"I55Q2G%"?=+#>>BH9>CC)CR5ZRCA27J5-B
-M-BN1N7:HR6;7<'IOUBVXNT.PA7<5YQBUJP7H$FJDMG.;>`Z+XESE]?S;_CEW
-M,WVXX2HZ,<:\3VYO%X.K8!P<%$@2N+==&"GG.6[%5=YU>CJ?)T/#'8)0L0/'
-M[>>G=T%!JD^78N?,MXVQJ<^2/A=;PJ[4VQW#0Y$_$[!I;@,:X:,CQTT;;MH0
-M'0*LHIJBM`RQ&LZO=>_=BD%./FR/R?DU3\SV;?K;@$J!M0O@UZBOW95QNSYC
-MF.UK1H=1-:5SI<'@6Q5^?_RV$K_&;J2#_\M^QN(U7!2<9OL<=TIPE0^W"R5)
-M3IG?I>T$=_3_B)-[ZB@G=&L=FYM5S,YBS6Q>:F<H.R@K$";T80Z<[`L7??=+
-M&9AM=T<?++=K"5?GX\L$AU>V"SFNF3++B@FOG-YQJ:YE-D8SCXPW1BY!\LCU
-M..1-!';,+,X#W:AEO=TQ?"[RQP,Q?(K8OFT8DBF;0AF`;`H=L&-6:'F_'SHH
-L9+HH$([QHD`XQHL"X1@O"H1CO"@0CO&B0#C6BX)V5T`A#O\`HP_9YET.````
+M'XL("+DEAE4``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD+F]U=`"METUOXR`0
+MAN_Y%2/UEH.%QX#I)9$J];Z7W9[!M:NHVFW5[*$'__AE##C@KS1;8@=AP3Q^
+M!V;&@C'W`Y`5R`YD"U)0O^8@[Z%6`';0WSBTI7^$OGG[TS9_3Y^%__4[!RM9
+M;)6:DSU6P.U+:D!-+Y'/U(<^8(J[QY?]Z?=+P*''H0>)FJPJ!&EF[U%L5$>D
+MIQ.^3M55<W47*^=@UT'513.J6%U1'&,<MU9V/MT2C!C6)]S)0S(0XQ)U@DVL
+M(IE+BQHYNX236U:WX/8[OQ<N5&Q@U+9E($NHD?HV;,(ZS&X;*I_G=_UQ;B?Z
+M<"549+09TS&^[B[Z4,$PV2O@)'#+71@HYREN(52^M7HRM>.^8Q>!B3"`@_OI
+MZEU0$.N3)=M8\_7-6-6G21^W>:87VO6!_J%(KQ%HS&U`Q5QVI+C18=/X[&"@
+M!;64I:7/5;]^C7UN%S;DZ-+V$*V?><Z\OZ:[#2@$:#T#_@SZFDT9M^M3*O/^
+MJB%@;#VVY5Q(4/A5A4^/OQ;R5^F5<O!_U4]IO(8+@N-JG^*.$:YRZ7:A1,4I
+MB;NX'^$.[A]P?$L=U81V:6#569$Y6+2:V,7[#&4+905,^3%,@>/^PD7?_5P&
+M)NYNZ(.YNYIP=3J_C'!XQ5U(<6:L+`M;>&7U#G-U3>;-,-/,^&+F$B3-7(?#
+MO(5`#Y7%1J"=-6_7!_H?17HY(/I/4;9O&_IBFDTA]\!L"BVPS:Q0Y_U^2*\P
+LTT&!<!D/"H3+>%`@7,:#`N$R'A0(E_&@0+BL!P5ICX",[?X!!W"B9UT.````
 `
 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 9efe743cce4f..cecbe9d03cab 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("'<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`)````
+M'XL("+HEAE4``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD9BYO=70`K94[;\,@
+M$,?W?(J3NF6P>!CL+(E4*7N7-K/MX"B*VBX=.OC#]P#C\+#SJ#`$X1S\\C_N
+MN!!B'X"2`6EFQF7#\%J$;5BM5X9&V^>`-0%"$V"!0(OK$(<+4&8C],A[_:I'
+M;2"Z=_BNQKGM,""AV&'#9UMXN..T*^W+!H/SGZN[_7-`(:!I$N"[T\=NRGA>
+M7Z4RQ[<V"2,J*`4("35[5.%A_Q$IM#B:RV&+8_=P3K#-H#G<SL-Q-/;>2IN)
+MXRX_[_RYA]O:C\.5M]3A21`U9UAT5N1-EAI;N,^/,U`%E`.I1QL+@5-\X:IO
+MD\I@@;LW]$'J;J-Q5;B>>CAVQUT(<>U4669">.?TMJFZ+G,P:'PS'KRY&A+>
+M7(MC>0O!QE06S$!<E8[+AN&M")L%EB,PUPE2]]\F.<@>I`(I]+PJ06Z@JGT@
+M"S-IZ+Z_5/=S_O4B;'#4%H/9KO<SKF^+K(`U^D?D4<\]?2_[T_K\>7(X5ZI<
+M1<++AKLX`]E&[M+8W<.976)U/#XD&IT>TSK]LH??!*>W\W'EY*SJH3T:G.O!
+>2V"8*U4&)TBTZ[^QM3B9.57P?W?U!^R^27D0"0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
index 056cb492290d..6257a74423a8 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-pc98.vhd.gz
-M'XL("&3N+50``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9"YO=70`K9=-3^P@
-M%(;W\RM.XLY%0T^!,ALG,>K:Q.A=,[VM<7'5."Y<],?+*3"%TG8<+],.H0$>
-MWO,!!,;L#T!6(#N0+4A!]9J#W$*M`$RC>W$H2_<)??/VVC:?+U^%^_4;"RM9
-M."H>3N.Q`FXFJ0$U32+_4AUZCRDN;I\O7_X]>QPZG)^82^`(PD!X,H]B1W5$
-MNKM^N)FJJU)UXR@[3]=!U04]JE!=4>Q"'#>C3']Z)71\D.G?Z"-J"'&1.L$F
-MHP*9<TX-C)W#R;51Y^`N-RX6-E5,8M2F9"!+J)'J)FV\'Y+7I,K7X5U_'-J)
-M/EQ(%1D$8]K&E\U%ERKH.SL%G`2NF0L#Y3#%S:3*?WE/QN.XJQ@G,.$;<#`_
-M]MZ(@E"?+-F*SY>#L:A/DSZSMIB>*9<;^NLB?H[`?7<>4`C0*?#1&]R0OBV'
-MAL_YW2W9)&-&@W=Q?)N%[/MU?-O,_D.]*N1\A4IE5J@&A:*F#5U(4/A3A7]N
-MGV96L-+90F)Q>`KG!8?[?8S;!;C*+KB1$B0;-"54K?L(ZP'NROX]CJ^IHUVA
-MG6M8-%9D3A:M)N/".$/90ED!4ZX-8^`QOC#JVZ8R,#)W11^DYFK"U7'_,L#A
-M"7,AQNW=R>M[1B$\X;VK5%V3.1C[Z<KXX<HE2+QR+0[S;@1ZV%E,!M(NGI3+
-M#?U]$3\6B.XPRG:ZH3L]LBGD#IA-(7?G1T:%NEE-MG.S4#J%F:X*A,MX52!<
-CQJL"X3)>%0B7\:I`N(Q7!<)EO2I(<PED;/,-H6X,)U\.````
+M'XL("+\EAE4``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9"YO=70`K9=-CYLP
+M$(;O^14C];8'9,8?.)>-5&GOO;1[-A164=5VM>EA#_SX>K`=;`QDTSH09&3/
+MPSL?MF7&W`]`<5`#J!Z4I'8C0!VAT0"VT]\X/6O_"F/W^U??_3F_5_XW'ARL
+M9K%5:D[VR$'8CS2`ACZBOE,;QH"I/CV]/)Q_O@0<>AQZD&S(BB.H-ON.9E=U
+M1'H^XX^E.IZKFZV<@\,`?(A&\%A=59UBG+!6=CS="EHYQ2?<R4O2$>,2=9(M
+MK"*9:T&-G%W#J3VK>W`/!Y\+5RJV,!K[9*!J:)#:MFQ"'++;ELK[Y=6\7?J%
+M/MPH%14E8]DGMMU%7RH8!GL%@@3NN0L3Y;+$K93*?T5/I7;"-VP0F`P=.+F?
+M1F]&0:Q/U6PGYMO)V-1G2)^P\\RL/+<[QL]5>EV![7`?4$HP.?!K<+@C?4<!
+MG5B+NY^R6<7,#I_2_'8;U??/^>T+QP_-KI#[%6I=6*&>%-H5V2[H4H'&CRI\
+M?OJV,H.U*982A\-;N"`X7N]3W"G"<3?A9DI4;-#5P'O_$K<CW*/[!YS84T>K
+M0K_6L>FL+%PL1B_LXCQ#W4/-@6G?ARGPFE^8]1US&9BXNZ,/<G<-X9IT?!WA
+M\(:[D.):O_.&D4D*;T3O,5?7%4Y&NYP9'YRY!$EGKL-AV87`3"N+K4!:Q;/G
+M=L?XI4HO!T2_&17;W=#O'L44"@\LIE#X_:.@0M/M%MN]5:B\PD)'!<(5/"H0
+DKN!1@7`%CPJ$*WA4(%S!HP+ABAX5E#T$,G;X"[Z,PAU?#@``
 `
 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 1cd1b69fdb0c..dd1a6651e606 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("'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``
+M'XL(",`EAE4``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5.V^#
+M,!#']WR*D[IE0/;Y`2Q!JI2]2YN9$(BBJNW2H0,?OGY2VT`>E3$A)H=_^=_#
+M!R'V`.`(I%VXKAO&YR(>XV:[,30Z/`84`MHY\%4!#0ZUOII#QT'-DA/88&9T
+M9A@+=S3NV^.H,LY!;M6J8<(5$\ZYRS/'#\E5(8\K+/O,"BNC4)3`!0@)%=ZK
+M\+!_2Q1:7+:46!S>PGG!KG@6<$V`8\HX!$^&Q08=!=:[FW`>X';VXW'\FCH5
+M"=(O&5:=%7F+I5(C7A?F&6@/E`&IG`UCX)1?^--7SV5@Y.X5?3!WM]6X,GZ>
+M!CB\X2[$N*/&!?F,4G@C>KNYNBYS,FBZ,^[<N1H2[UR+P[R-H#:=156@[N*S
+MZ[IA?"GB88'<`7-%D/JWFV0@!Y`]2*'G)0=90UF%0(PK:>R^/OON^_(39-C@
+MJ&T&BZ=>CTSO%ED"MOI/Y$G/`WU/^_/V\G'V.-^J?$=2FTVM8@CRF+A+4W</
+M%WQ/U;$T2#2)'FJ=8=M3OT31:T(<GYSM!SB>#,Z?T4UD6&I5!B=(LNJ_N;4X
+0F;E4U(MW\PM:UWFK$@D`````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
index 7c4a413cb062..995a75abbac5 100644
--- a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-4096-vtoc8.vhd.gz
-M'XL("`;&'50``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YV:&0N;W5T`*V6S6[;
-M,`S'[WD*`KOU8,B4+-NG`NO6VX`!>X')MEP4P]:AW:&'//Q(6XXE?ZU9F0B.
-M#(D__2E1#)4:/P!6@^W!>K`%]TL#MH:R`J#!T'!XYN$5SNW3+]_^>7S-PN=\
-M&F&YBJU2<[9'#886*0$=+V([[L-YPF0?/C_<//Y\F'`8<-/"QH)!*`AB%NOD
-M4*F+.B;=?_SV::E.+]7%5ORCH>]!]]$,':O+LML89\B*YG.ST(\RIY:\)`,Q
-M+E%7J(55I'1K4R-GMW#VR.H:W,TIG,48*A08)3T5V!Q*Y#Z%S;0/JT:A\OKR
-MVSV_^(4^W`D5>]&7K\;:?7<QA`I.DX,"BN7FT%T8*#^6N%6HO'/W;&IGTDV*
-M7\89M#NJV'?7SKN'TZ91(]6J/#J,;/!7K7"H#JR.<#ON.G:7;BL%"">58KZV
-M&@$T];K-_;M_]IXN+NHOB3ZW$RS_?1RN2NS^<=DJ4#4GL=WC</5L5;__[CHG
-MY>Z(:]Z*HYRA.N@\>+_`?8]PK?!A-"MW_1#_:DB_5[O;3.[J>?)XKRBS[^"B
-MO'R[Q+7)58L;PFR_H0XVU7477-."T:G5H;-W6S@O&BI-_U9<YZ"A.,FA/\C*
-M[:&(:T,%0UX12U0HK5!WE>=A^BM7;N.Y/W#^FJ7?$6B"0C&7"2BKT`:@F$)+
-M1:2HPK*K4?24JZ!0J&YFG&#=S#C!NIEQ@G4SXP3K9L8)ULV,$ZV;"4BQ=_H+
-(%O'FLVP-````
+M'XL(",,EAE4``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YV:&0N;W5T`*V636_;
+M,`R&[_D5!';KP9`I6;9/!?;1VX`!.^PZV9:+8-A:M#WTD!\_TI83R5]K5B:"
+M8T/BXY<4Q5"I\0-@-=@>K`=;\'UIP-905@`T&08.USP\PJE]^./;E^-K%CZG
+MPPC+56R5FK,]:C#TDA+0\4MLQ_=PFC#9AR_W-\??]Q,.`PX#J"C92B/89O:>
+M'"IU5L>D'T?\-5>GY^IB*_[1T/>@^VB%CM5EV6V,,V1%ZWE8:/(A/M-('I*)
+M&)>H*]3,*E*Z%M3(V36<W;.Z!G=S"'LQI@HE1DE7!3:'$OF>TF:*PV)0JKP^
+M/[JG9S_3AQNI8L_Z\L5<N^TNAE3!:7%08):IDKH+`V6>*KA(E7=&SZ9V)@U2
+M_#"NH.BH8MM=>XD>3D&C0:I5N;<9V>"O6N!0[5CMX3;<=>RNL9P@7%0*,`@%
+MG7W#AQ<TW76K\;M[\O[C]\^HOR;ZW$:R_/=VN"JQ^\=AJT#57(0VM\/5%ZOZ
+M_6?7.2EW1USS5AS5#-5!Y\'[&>YGA&N%-Z-9N.N'_%=#^;W:W69R5U\6C^>*
+M*OL&+JK+MW-<FQRU>"!<[%?4P:JZ[HQK6C`ZM=IU]M,:SHNF2M._%=<Y:"A/
+M<NAWJG*[*^+:5,%05\0*%4HKU%WE>9K^RI5;N6Y/G+YEZ7<$FJ!0S&4"RBJT
+M`2BFT%(3*:JP[&H4W>4J*!3JFQDGV#<S3K!O9IQ@W\PXP;Z9<8)],^-$^V8"
+-4NX=_@(M$JX@;`T`````
 `
 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 adb8aef9a0ba..fc274e57a3f8 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("($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``
+M'XL(",0EAE4``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME#MO
+MPR`4A??\BB-URQ"9A[$]1>IKJU2I0]?:!J(H:BM5'3KXQQ>,$P/!;AH9(T0$
+MY^,><KE9YAK`!0H*D=O.*7(&SL$HP,Q,PFR).KK'+Z5N7^XI>]KTK5LY&#&+
+MY_L'U>1"MXE:MUH/P#+0D7E@B:Q"1I-`AZM&5?4G;BX^AZN7LNMPS:4X848)
+MJ:!4A'OS<.W"?P8YLZM`W(1=89<<[;)QL]9V9'H*1T;<-L:-=FFDHACUB>B0
+MC$Z><$T+SD+5K-F[%$XMFBI$7XJ3-1J3)P2ZG<;1V2#^FRJ%+'M@;G;5B7%Z
+MH7O>A)\#-@-PJ0A).50^P2`TA.J+'T/!(2H4I0^D0=Z@:S\_5/N]__%NL,?9
+MRF>R-]FMGII::@XI0&M[B)!V[L5W\[!;[]]W1QP=7-'AX+RP*E.411/9)2A#
+MNZ][>HBC8_$E^2KW!DV<3(>/QK^]K8_C)[.F`)GG8>_GV(,?P4(J^WI<GD6J
+4J]]&CQ,+IXK)O=4O0#"/42X'````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
index 68c383866a79..da8f61af68f6 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-512-apm.vhd.gz
-M'XL("/;%'50``VEM9RTV,W@R-34M-3$R+6%P;2YV:&0N;W5T`*U66VO;,!1^
-MSZ\XT+="@Z['W=/86/,V*"M[;HTCE\#:AB:P/OC'5T>76HYES\WD"$5&/I\^
-M?><B,>8?`)2`+:`!U#2N%.`7J*X![&1HPO4\O$+7O#R;YKA[6X>G6WDPSE*K
-MH3G9"PG*+E*!J&D1W-(8N@BSOKAYO-P]/48X$>#BP@I!"=`61(W60?;!CI`V
-MW^]^.,B'GIT<L^NM_%_;@FR3+V1D]^#ZK^EFE;6RWU.K0&I',[;!RV""X/0Z
-M>2*<9B=6"<V<J,EF<W`X9_49N,M5\(4/%1L8E>VM=!PJ06,;-E&'4;.A\G;8
-MUZ\'<\)/3(0*?O#CHSDYO5T10D7$CP,#1>$\MUUP*,=3N$RH_)=Z.+1386!%
-M8#I."+?]H7H]%*3\D+,9S:>=,<FO)GXV-;6(R>Z:_->&;WX1##MU1SWAW;/U
-M:VC:9HC:YJ*B?^'#B>[V9S9<&N*G.(4Q17)#,;R$W[?]_H_)P(E2V_5P<LQ.
-MMR'G7-+Y$NUZ7[IU&]G=VVP[[HZ[E^?["$>%BDJM0US.[JG>9]GIPKXU"WT;
-MDT8$P*%O(?(SI6//.'<@"4\GI.[/(+&UQ#7-V?<1X.;5&'L*7?W>W*7Z&566
-M'V<+]!.)?CY)4OW2VL*G#O'S^<WJ1X=)E8G-7K_#7Q^(D5]I_430C]69?GJB
-MNUT/?QY0A&):K#J+OOJ58:@"8#&&JL_A4@PYSCKSLU[&P+#051>GJ\PY5UV"
-I*WC5Q5"R)JW\W]*K+H:25>BJ2W`%K[H$5_2JBZZ@KMX!;=,CGA\-````
+M'XL("(HEAE4``VEM9RTV,W@R-34M-3$R+6%P;2YV:&0N;W5T`*U62VO<,!"^
+M[Z\8Z"W0Q1I+X_944IK<"J&A])@X7CF8-,F276@._O'5Z!'+SSI;[0I90I[/
+MG[YY2%GF?@"4`]5`&DCQN)!`GZ'X!&`6?4/;"S^%MGI^TM6Q>=WZ7[MQ8"*+
+MK?KF;(\Y2/.1`K#DC]".Q]`&F.V'B_NSYO$^P*&'0P^D"K;*$>AN]!W*WM@Q
+MTJ\&'RSD;<<N'[/KK-RCKB&OHS?RP.[6]E_BS4IC9=[G1MQ8G]!ZD]Y"M]F!
+M=BH;6$4TIT2--CL%1TM6[X$[VWA?N%`Q@5&8WD@GH$`>F[`).HR:"977P[Y\
+M.>@!/YP)%7KC)T9K^?QVT8<*AI<]`\GAO+1=L"C'(=Q$J/R7>M2WDWY@1,A4
+M6$"[_;YZ'13$_$AD"YK/.V.67\G\3&HJ[++-M/Q?&[[XP3#9T!WEC'=/UJ_B
+M99,A<C<5%=U$]!?:J^^3X5(Q/RDXC#F2*X[A-?S.]_O?>@(.4VW7P>5C=JKV
+M.6>3SI5HV[O2K>K`[L9DV[$Y-L]/-P&."Q676HNXGMUCN9]DIQ+[5J_T;4@:
+M](!]WT+@IU/'GK;N(!:>3T@%$D&9@TP"[@QQQ6MF/@*\?-'ZZ_6WCS\OKV/]
+MM$S+3V0K],-(/Y<DL7YQ;1%SA_CI_!;UX\.DF(C-3K_#'Q>(@5]J_=#KEY43
+M_?Q">[7M_QT@^F*:K#IC5_W2,)0>,!E#V>5P*H:"%IWY7B^39YCHJDOS5>:4
+KJR[#);SJDB]9LU;NL?:J2[YD);KJ,ES"JR[#);WJDBVHF[_Y8*QC'PT`````
 `
 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 7a293bcbd0eb..43c18941202d 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("$@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``
+M'XL("(LEAE4``VEM9RTV,W@R-34M-3$R+6%P;2YV:&1F+F]U=`"M54UKPS`,
+MO?=7"'8K+"2V;&>G?;#V-B@K8\>2Y:.$K6WH"MLA/WYV;*]VDI9NV!'&1M'C
+MZ<F6XU@/`&3`",328F/8S<=]SZ"=/4=RW$5VM!,-EIR+.@T7]48[F6I`HMQ,
+M$BH&<=0%3'Q'NWCJ`VHXQ0\3$+$RG@-G%_&[;YJ/<@2.A$I7P]$A.U9UZP1`
+M$!`(_,;,O`)>*K=AMVJR_:$^U+OMRL+)*@(O5+#X"[M-UHRR8X%KBQ?6%LV"
+M&$"_MF#Y8>BSAUTYN!)>%D(:$F`4$($4DCA3/KD?`,[W9?FP?+Q^F2]=_1`#
+M\^,7Z$<<_?0E<?4#EQ\/K1\_JY^@(,3(V3SJ]_FE#Z+E%UJ_U.@79R/S:4>[
+MB/Q/`Z(!#,8P-=V94W/7E8C4]H#4!23'\G:`^6Y;YH?ZV[W!J>G.535N*IY0
+M]19P`23K6DRAU@Z_J]EZ6F_6%LYV/_MP,*&BJ"SWVR#=U$_WM2;O?79T*%+J
+MJ9<HGK3R$O?4NW7A\#?9LH1<ZV/-VWB.T=ZLX+KNY_[\W]IJ.![XJ,B'<O(#
+(T:JTQ-('````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
index 2e7c6573ef52..b965ffdd55a5 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
@@ -1,17 +1,17 @@
 # $FreeBSD$
 begin 644 img-63x255-512-bsd.vhd.gz
-M'XL("/?%'50``VEM9RTV,W@R-34M-3$R+6)S9"YV:&0N;W5T`*V7/6_#(!"&
-M]_R*D[IEL/`98W=IHJCI7*E2.[O$CC+T0TV'#/[QY6R(#W\E;;$)PH)[>(\[
-M$!&B?0!4`JH"58)*J9U)4+>0Y0"FTQ9LZMA^0JT_WDO]?3A%]JD7+2P6W,HW
-M)WM,0)I),L"")E$[:D/M,-'-=K\\O.T=#BW.32P52(340.1@GER<U1'I8?-T
-MWU>7#-5U5NT\505)Q48D7%T4K3A.&BLSGHJ"2C8R7?$^O`Z.\]2EHF?%9(XM
-M*G-V#*?FK'Z#6RYL+-I4,8F1F5J`BB%#:INT<>LP*"953L?/XNM8]O3A1*HH
-M%HQ^GYQV%VVJH!ML%4@2..<N-)1C'S>2*O]:/>7;2=LPBR!2UX&-^_[J=2C@
-M^E0L9M9\.AB3^@K29_:6*$;JZ8YZ$_GO&:@)F&:TW5,%.5Z[@B_;Y['XZHET
-M^>/NT'@)YP3ST\#'K1@N:</145CR@HXA*;MO.8*[,[]UAY-SZBAGRK&.26?3
-MP,FL\YX=CS/$)<0)B)QE-0.>XPN=OMNA#/3<G=$'0W<+PF7^^)CA\(*[X.->
-M[;G,!G<AO+!ZZZ$Z'3@8N_[.N'+G$L3?N2T.PQX$V)PL)@/-J&$]W5$_1O[;
-M`M$>5<'./G1'52B%T@*#*33`,K!"+&>3[;=9J*S"0!=)P@6\2!(NX$62<`$O
-=DH0+>)$D7,"+).&"7B25^8L@Q.('-E=QRWT,````
+M'XL("(XEAE4``VEM9RTV,W@R-34M-3$R+6)S9"YV:&0N;W5T`*V7.V^#,!#'
+M]WR*D[IU0.9L#%V:J%+W3NU,"$11U8>:#AWX\+T#$\Z\DK0&8AG9]^-_#UN.
+M4NT%8#78"FP)-N%^:L#>09H!T*![L&EC]PIU\?%>%M^'G\A=]:J%Q4I:^>9L
+MCQH,?20%S/DC=L=]J#M,=/.XOSV\[3L<.APZ4)*RE4:PV]%W,G52QZ27`[X.
+MU>FQNMZJ=;"J0%=BAI;JHF@M<8:L:#X_%K9)$Y_N\5Z\`8GSU"5J8"5D3@55
+M.#N%LTM6U^!N5RX7;:E08:34*K`QI,A]*ILN#J.'2N7G^)E_'<N!/IPI%2N2
+M,1PS\^ZB*Q7L)CL%A@4NN0L-Y3C$393*OZ)G?3OC.A0$E70#V+CO1Z]'@=1G
+M8[40\_EDS.K+69^A=99/M/,#]4/DWR=@P4!:K[3<$PL97AK!E\?GJ?P6,^7R
+MQ]51X#E<)UCN!CYN+7"Z34=/$<4+10RZ[-_-!.Z>?IL>9Y;4<<V44P.SSB:!
+MB[G(!G8RSQ"7$&M0F:AJ`3SE%WI]=V,9Z+F[H`_&[N:,2_WYL<#A&7?!QVW=
+MOBPF]RD\$[W-6%T1.!F[X<JX<.4RQ%^Y+0[#;@38["Q4@31KW,X/U$^1?[=`
+M=%M5L+T/NZTJE$+C@,$4$K`,K!#+Q6*[M@JM4QCH(,FX@`=)Q@4\2#(NX$&2
+<<0$/DHP+>)!D7-"#I*6_"$JM?@%SQ_>F?0P`````
 `
 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 2d08e91eea3c..f71cccd39af7 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("$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`'````
+M'XL("(XEAE4``VEM9RTV,W@R-34M-3$R+6)S9"YV:&1F+F]U=`"ME#MOPR`0
+M@'?_BI.Z9;#@>)@L350I>Z=V=EP<157;I4,'?GPA-C%G_*@J`[:,COM\#^X8
+MZP:`1&#UQ'M>X)Y*.EVQ*VXT#$!5@52@-!A_G`V+;(C`O9Y>RG2X'L>7M.9Q
+MY6A$'*[AHL&BG<,=$ISPPC8YR7BBU7`0=MC+"=RC?XX#3BY9YR/![)1@UEFU
+M5>QB;LU(+\TS<`M<`#.]#"GPGE\8[-OG9B!Q=\$^R-VM`ZZBYWF"PQ5W@>+.
+M`<?)X2&%*]$[YM8U&R=#C"OCCY4;(+1R.QQNVPCPUEG\#?2G\O>\P#V7='9`
+MV0,WBZ#I>Y\6H%O0%K0*WY4$O8?*I$"D-\DU7Y^V^;[^I!D..-XU@\D5]%&$
+M:M$58!U^HM_"=V+?P^FRNWY<(BZVJMB1?+%Y+8&@SYF[9E1L5WP?6R?R(!D2
+M/1[L3-N>_S.)WB'%R;NSUD+3Q2<NLB&"R585<(J-M/Z;VPZG-[XJ_O(5OUHQ
+&I0DP!P``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
index eae437d6652b..5865a83838f7 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-512-ebr.vhd.gz
-M'XL("%/N+50``VEM9RTV,W@R-34M-3$R+65B<BYV:&0N;W5T`*V736_C(!"&
-M[_D5(_76@X7'@-U+(E7-GE>JVIZQ:U<][(>:/>3@'[^,@63P5YJ6F""L81[>
-M@0$+(=P/0!>@.]`M:$7M4H*^@[("L$9?<*AS_PI]\^=WV_Q[/V;^UV\<+!?<
-M*W8G?RQ`VD%*0$.#Z%=J0Q\PV<W^[?;]UUO`H<>%@:4&B:`L1$[&J<1)'9%^
-MW#\^C-454W5G+S=.UT'1L1X%5Y=E.XZ3ULOVIZ*ADX/,4**7R,!QD3HE1EY,
-MYMRDLF#G<'K-ZQK<[<:OA4L5FQBEK07H'$JDMDV;,`^38E/E>/AK/@[M2!\N
-MI(IFBS&VR>5PT:<*ALY>@22!:^'"0#F,<3.I\JW9T[&?]`T["4(%`P[AQ[-W
-M1@'7IW.Q,N?+B[&HSZS&]86`Z_IZX,KNJ!N_.P08137MTMSO5>_?V/=V1M_.
-M;=LMQ[VF#K>[#J@4&#,!/@5]3>+EJ"HRV[-3F)EZV=#?9_%S`@X)HTHZSI6&
-M"C^K\&7_/+.^E5DX#JX/V.'P$BX(YJ=]C-LQ7.&V&T_5LQ?/.]YFN*W[!YQ<
-M4T=G0CMG6`Q6)4X64XW\^#I#WD)>@*B\#6/@:7WAK.]N*@.C<%?TP31<0[@R
-M[I\S'%X(%V)<?3I99I;PPNQMI^J:Q(M1CW?&)W<N0>*=ZW"8]B`PP\EB,]#V
-MFM;+AOYG%C\.B/Y3E.S;AOXP3:90>F`RA1;8)E9HTGX_M%>8Z*)`N(07!<(E
-CO"@0+N%%@7`)+PJ$2WA1(%S2BX*V5T`A-O\!]-GJEUT.````
+M'XL(")(EAE4``VEM9RTV,W@R-34M-3$R+65B<BYV:&0N;W5T`*V7/6_C,`R&
+M]_P*`K=U,&1:DMTE`0ITO^6:67;L(BCZ@>:&#O[Q)UI20ODK34^Q(\B@^/BE
+M1-&0$.X'H`O0'>@6M*)^*4'?0UD!6*._<6AS_PA]\_[6-G^/7YG_]1L'RP7W
+MBMW)'PN0]B4EH*&7Z`/UH0^8[-?C\]WQ]3G@T./0@U1)7@6"KB?OJ<19'9'V
+M1WP9JRNFZBY>+L"N@Z)C(PJN+LMV'">MEQU/MX9:#?,3[N@A,G!<I$Z)D1>3
+M.3>I+-@YG%[SN@5WM_%KX5+%)D9I6P$ZAQ*I;],FS,/DMJGR=?HPGZ=VI`\7
+M4D6SQ1C;Y'*XZ%,%PV"O0)+`M7!AH)S&N)E4^:_9T[&?]!T["4(%`P[AQ[-W
+M00'7IW.Q,N?+B[&HSZS&]8.`Z_IVX,KNJ!N_.P0812WMTMSO5>_?V.=V1M_.
+M;=LMQQU2A]O=!E0*C)D`_P1]3>+EJ"HR2UM'S4R[;.@?LO@Z`X>$L?78EG.E
+MH<+O*MP_/LVL;V46RL'M`3L<7L,%P;S:Q[@=PQ5NN_%4O7CQO.-]AMNZ?\#)
+M-754$]HYPV*P*G&RF&KDQ]<9\A;R`D3E;1@#S^L+%WWW4QD8A;NB#Z;A&L*5
+M\?B<X?!*N!#CZG-EF5G"*[.WG:IK$B]&/=X9W]RY!(EWKL-AVD)@ALIB,]".
+MFK;+AOYW%E\.B/Y3E.S;AKZ8)E,H/3"90@ML$RLT:;\?VBM,=%`@7,*#`N$2
+B'A0(E_"@0+B$!P7")3PH$"[I04';(Z`0FW]0II$670X`````
 `
 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 2e2f8c518db8..a2ee04cc2a0d 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("%`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`````
+M'XL("),EAE4``VEM9RTV,W@R-34M-3$R+65B<BYV:&1F+F]U=`"ME3MOPR`0
+M@/?\BI.Z98C@,-A9'*E2]BYM9MO!452U73IT\(\O9X(+&.=183""''RY%V?&
+M[`-@WF1?%@R;Z!E6Z]5(X^WC0)X$6EQ'ISAM:R2-HJ<EC1.N,VN=T&]GFGEJ
+M'W?,;6[_&%!*:)H9\-7IAYG#46H2%PBL28S+@N%Y$S8'K,:$D244$J2""N_5
+M\+!_2\2W8CR7P1:'MW!.89M!*=S.PPDC[+V=-A,OI_R\\^<>KK:OPQ77M#.>
+M8#HE6#16YDV6RK3PG!]GX!JX`%9=9!@"I_C"GW[;N1H8F'M%/YB;VQ"N#/=S
+M#X<WS(40UTZ5)1'"&]ZKY]IUF8/!XYMQY\TE2'AS+0[S%H+M6%E,!II=\W%9
+M,+QLPF:!Q068RX/<?=N4`-6#TJ`DS<L"U!;*R@=BF$E#]_6IN^_SCQ?A$<=M
+M,4AV.H^";HLJ`1OZ$W6DN:??T_ZT/G^<',Z5*E>1S&4SIP2":B-S>6SNX8SO
+ML78B=A*/O(>DIU_VS"^!]W8^KIB,U3VTQQ'G>K`(!*E2->(DBT[]-[86IS*G
+.BOGNKGX!'5^1W!`)````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
index 0473ed986b1a..438b398df848 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
@@ -1,22 +1,22 @@
 # $FreeBSD$
 begin 644 img-63x255-512-gpt.vhd.gz
-M'XL("/G%'50``VEM9RTV,W@R-34M-3$R+6=P="YV:&0N;W5T`*U82V^<,!"^
-MYU=,U5NJ4F-LPYZJ1DVDWM)';CT$#$0KM=M'<LB!'U^/L1<,-NDFPUI>D)F/
-M;YX>F;'Q`E`%J!Y4!TKB?2E`[:"L`,RB&]S.N7N$0?\Z=/IA_YBY:S@;P7(V
-MEPK%49X7(,Q'2N`U?D2U>`^#A\E>7]Z=[W_>>3CNX/R'A0+!01H0L?J.8D=V
-MB'1U\?6CA;R=V!5K=I/4^-?W4/2S-PK/[M;.[^?*"B-EWL=1`I/`Q#2"AV!A
-M4G9A.\D64C.:,:/.E(W!J2VI4^#.SYPOQE`Q@5&:V9@NAY+CO0D;;X?5,*'R
-M>/^[_GO?+?CQ1*BH([]\M5:DU>4N5+A_V3$0&,Y;ZH)%>5C"14+E1=93H9SW
-MKC&""1SWP*WZH?4F*)CS4SG;L'G:&4E^-?(SN<7JR)Q>&"ZR\'<$;)K3`+T%
-M0[BCPHU&^]DZTG631F.03(8M-AS"9O9K6F+_-OUI@%)"7:\`;SP_;=TA;<';
-M86"8XB!RD*;X3>%L=9=ZSN_RZA-<?_CR#<&^3^IJ#)>NQ0PR5;=O%^S6F794
-M=Q]+-LW'Z.-]5-DB"?<NFKL:D\V02L/%1AI.;$FYK>S_"ZF6+)2JYE*5A(J#
-MTM#62;@?`1QU7>YPN5%0:MS"90[:[N6M@CPW_$R:5!:$`S=^-QN[V84;!!P.
-MG[/#"/8V^_/&\>MR%Q&QD5Y(6:_C6Q&!I)Y0%T(XZKK<56@]26:]G0N6V$@O
-M)*U7C]:+&PE)Q5+WN*MEV:L0KJ&U7F[;1Y,?IGZOY_3"<)V%OQ&0NVV(;%_C
-MKI"2,10.D(RA</E+R#`7F\X\U<O*.86HPB`<885!.,(*@W"D%08!"2L,PA%6
-M&(0CK#`(1UIA%&TCI%PCQ$KK@`*:+J21;&D&[PC?<G@XOM4^;31"<6=0-D+J
-MJ4:H[Y+*^FNA+&$CI*@;(>4**=%9AO*-T)K#<\XRE&^$9A]^P5F&BC="SSW+
-:0#C"LPR$(SS+0#CB4,&^Y>P?_R=O5``3````
+M'XL(")8EAE4``VEM9RTV,W@R-34M-3$R+6=P="YV:&0N;W5T`*U82V^<,!"^
+M[Z^8JK=4I6#L@3U5K91*O:55JUYR"+`F6K7=/I)##OSX>L`&##;I)@.6EY69
+MCV^>'CE-APL`<\`64`,J>BXDX!Z*$L`LVB'Z.;-_H6M^G71S?WQ([-7M!K`L
+MG4OYXB0O<I#F(P6(BCZ"!WJ&SL$D+R]O+XX_;QV<L'#"`JF"I'(!6*^^@^G(
+MCI"^'<7W'O)F8I>OV4U2PT_;0M[.WL@=NYM^?CM75AHI\SX-A`8AE=/P_G@+
+MD[(+VZET(36C&3+J3-D0'&Y)G0-WL;.^&$+%!$9A9F.Z#`I!SR9LG!U6PX3*
+MP]WOZN^=7O`3D5#!D5^V6LOCZ@H;*L*];!E("N<M=:%'N5_"!4+E6=9#7\YY
+MUQ@A56Y!].K[UIN@8,X/LW3#YG%G1/E5Q$^:/*L"<WRA>Y_X]PA8U^<!.@OZ
+M<*/"=4/VZ^N`UI-&0Y!,ALTW')+.[%<?F/U;M^<!*@55M0+\ZO@UO3L42`2Y
+MI\`PQ4%FH`2H*9Q[W54SYW?YX2-<O?O\A<"N)W4;"A=]H`PR];,]+-BM,VU4
+M]QA*MD8,T2?:H+)Y%.Y-,'<;2C9#*@X7&G$XN24U[B7_X=L!3J6^5#F7*A64
+M9CMJX%!%X7YX<-QU6=-RC5`TM(6K#)I^+S\@9)GA9]*D[$$$".-WL[&;7;@F
+MP.[T*3D-8*^3/Z\L/YW9B`B-^$+,>EIL1021>D1=\.&XZ[(NR7J*S7I[&RRA
+M$5^(6J\:K!<V$I$*I>ZXJR7)"Q^NYK5>UK>/)C],_5[/\87N*O'O`5#8;8AM
+M7Q.VD+(QE!:0C:&T^<O(,).;SCS7RVB=PE1A"(ZQPA`<8X4A.-8*0X",%8;@
+M&"L,P3%6&()CK3#(VPBA;832HG=`#K7V:41;FLXYPK4<#DYLM4\;C5#8&9R-
+M$#[6"+4ZJJR[%LHR-D+(W0BA+:1,9QGH&J$UAZ><9:!KA-+)@,\XR\!P(_34
+<LPR"8SS+(#C&LPR"8PX5ZEMV_P`=.$-$`!,`````
 `
 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 73c7cbb715e8..40aef66fdb3d 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("%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`
+M'XL(")<EAE4``VEM9RTV,W@R-34M-3$R+6=P="YV:&1F+F]U=`"ME\V.U#`,
+M@._S%$;<%A$E:9*FIP&D!7%;$(@+E_ZDJQ$P"`DD#GUX[*;=23I)85%:J\K(
+M]5?;M>,IY_X`4!)XF[CF%=,K%I_3X>8PTT3W."`^GUS8`!D"/:Y')9=TCW,P
+MCHMP,5MY8Q3%+^L9QR['"Q;@AM!J(WE%B&,>MX8[/@ZH-;3M%?#CZI^<7X<&
+M94`U(/%^C$V`EJ#5`VZ.7?>A?[>OW\+=R_<?"/;Y$JX4J+0.J@:XAEIOO!/9
+M<!OV*P[7X]`ARGXU)H.MLKCC-GL>5Q%NV,&E)(]3>U:^AO[MW7J<YK&5#:VL
+M!BO!]#"T6=S7"&<*5YXB=6>@[L$XT`+ZD1:#`2'0/VP3.T,DR`%X`[4`V1%P
+M.K]C9P][SGX\6_Q38JF(E.05N>PIN5<1Y-1?PH485Y7.GJ7LZ6+9:Y9B24E>
+MD<U>Z[.73A(YE6I=Q"U98T]B7%<X>X;4V!^X?U]?\XKICL6G!ZH%6,S#>AS[
+M@MU!N(+=0;B"W4&XHMU!P(+=0;B"W4&X@MU!N*+=@4#'RPUQPE'MC<BJH>V@
+M<[$;V7$\L3>+8\<H7"?W1O_.$$^_#%=PB!-N=XB/+AOL>FR"+3C$"5=TB-OE
+M[[>IP,S]932M:P4&6\J&0'FIF1G8?S^[_N?I=Y@]P@E?$4DA>UE189H:9$L/
+M,0.M`_^>WM[?G+[=KSBY1+4F4-=D56'.NJMP;1SNIY/\LO4NL4W9*'OBJIPW
+MV\`QQ*F'8/'3`+<8KBX2_8@4R4(FW%PJX<W_^VX]KG2IX*?!X0]&S!$YLPT`
 !````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
index 251e27e9698a..16d286a648bd 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-512-mbr.vhd.gz
-M'XL("%;N+50``VEM9RTV,W@R-34M-3$R+6UB<BYV:&0N;W5T`*V72V_<(!#'
-M[_LI1NHM!PN/`9/+KA0U/5>JVIZQ8T<Y]*%N#SGXPY<QX`6_-MO,FD58P(\_
-MS,-""/\#T!7H'G0'6E&[EJ#OH38`KC,4'.LRO,+0_OK9M7]?7HOP&PX>5HIT
-M5CZ=YF,%TBU2`UI:1#]1&X:(*3X\/M^]_'B..`RXN+#4(!&4@\C%.D9,ZHCT
-MZ>'+Q[FZ:JGN,LNOT_=0]<F(*E57%*<4)]TL-YZ*AEZ.,F/)7K*.%)>I4V(V
-M*Y&Y=JC)9M=P>F_6+;B[0["%=Q7G&+6K!>@2:J2V<YMX#HOB7.7U_-O^.7<S
-M?;CA*CHQQKQ/;F\7@ZM@'!P42!*XMUT8*><Y;L55WG5Z.I\G0\,=@E"Q`\?M
-MYZ=W04&J3Y=BY\RWC;&ISY(^%UO"KM3;'<-#D3\3L&EN`QKAHR/'31MNVA`=
-M`JRBFJ*T#+$:SJ]U[]V*04X^;(_)^35/S/9M^MN`2H&U"^#7J*_=E7&[/F.8
-M[6M&AU$UI7.EP>!;%7Y__+82O\9NI(/_RW[&XC5<%)QF^QQW2G"5#[<+)4E.
-MF=^E[01W]/^(DWOJ*"=T:QV;FU7,SF+-;%YJ9R@[*"L0)O1A#ISL"Q=]]TL9
-MF&UW1Q\LMVL)5^?CRP2'5[8+.:Z9,LN*":^<WG&IKF4V1C./C#=&+D'RR/4X
-MY$T$=LPLS@/=J&6]W3%\+O+'`S%\BMB^;1B2*9M"&8!L"AVP8U9H>;\?.BAD
-KNB@0CO&B0#C&BP+A&"\*A&.\*!".\:)`.-:+@G970"$._P"C#]GF70X`````
+M'XL(")LEAE4``VEM9RTV,W@R-34M-3$R+6UB<BYV:&0N;W5T`*V736_C(!"&
+M[_D5(_66@X7'@.DED2KUOI?=GL&UJZC:;=7LH0?_^&4,.."O-%MB!V'!/'X'
+M9L:",?<#D!7(#F0+4E"_YB#OH58`=M#?.+2E?X2^>?O3-G]/GX7_]3L'*UEL
+ME9J3/5;`[4MJ0$TOD<_4ASY@BKO'E_WI]TO`H<>A!XF:K"H$:6;O46Q41Z2G
+M$[Y.U55S=1<KYV#70=5%,ZI875$<8QRW5G8^W1*,&-8GW,E#,A#C$G6"3:PB
+MF4N+&CF[A)-;5K?@]CN_%RY4;&#4MF4@2ZB1^C9LPCK,;ALJG^=W_7%N)_IP
+M)51DM!G3,;[N+OI0P3#9*^`D<,M=&"CG*6XA5+ZU>C*UX[YC%X&),("#^^GJ
+M75`0ZY,EVUCS]<U8U:=)'[=YIA?:]8'^H4BO$6C,;4#%7':DN-%AT_CL8*`%
+MM92EI<]5OWZ-?6X7-N3HTO80K9]YSKR_IKL-*`1H/0/^#/J:31FWZU,J\_ZJ
+M(6!L/;;E7$A0^%6%3X^_%O)7Z95R\'_53VF\A@N"XVJ?XHX1KG+I=J%$Q2F)
+MN[@?X0[N'W!\2QW5A'9I8-59D3E8M)K8Q?L,90ME!4SY,4R!X_["1=_]7`8F
+M[F[H@[F[FG!U.K^,<'C%74AQ9JPL"UMX9?4.<W5-YLTPT\SX8N82),U<A\.\
+MA4`/E<5&H)TU;]<'^A]%>CD@^D]1MF\;^F*:32'WP&P*+;#-K%#G_7Y(KS#3
+K08%P&0\*A,MX4"!<QH,"X3(>%`B7\:!`N*P'!6F/@(SM_@$'<*)G70X`````
 `
 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 1c5ff2872213..5b0e076ac9a0 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("%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`````
+M'XL(")PEAE4``VEM9RTV,W@R-34M-3$R+6UB<BYV:&1F+F]U=`"ME3MOPR`0
+MQ_=\BI.Z9;!X&.PLB50I>Y<VL^W@*(K:+ATZ^,/W`./PL/.H,`3A'/SR/^ZX
+M$&(?@)(!:6;&9</P6H1M6*U7AD;;YX`U`4(38(%`B^L0APM09B/TR'O]JD=M
+M(+IW^*[&N>TP(*'88<-G6WBXX[0K[<L&@_.?J[O]<T`AH&D2X+O3QV[*>%Y?
+MI3+'MS8)(RHH!0@)-7M4X6'_$2FT.)K+88MC]W!.L,V@.=S.PW$T]MY*FXGC
+M+C_O_+F'V]J/PY6WU.%)$#5G6'16Y$V6&ENXSX\S4`64`ZE'&PN!4WSAJF^3
+MRF"!NS?T0>INHW%5N)YZ.';'70AQ[5199D)XY_2VJ;HN<S!H?#,>O+D:$MY<
+MBV-Y"\'&5!;,0%R5CLN&X:T(FP66(S#7"5+WWR8YR!ZD`BGTO"I!;J"J?2`+
+M,VGHOK]4]W/^]2)L<-06@]FN]S.N;XNL@#7Z1^11SSU]+_O3^OQY<CA7JEQ%
+MPLN&NS@#V4;NTMC=PYE=8G4\/B0:G1[3.OVRA]\$I[?S<>7DK.JA/1J<Z\%+
+=8)@K508G2+3KO[&U.)DY5?!_=_4'[+Y)>1`)````
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
index dd481004e925..8d76c35544d1 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-512-pc98.vhd.gz
-M'XL("%CN+50``VEM9RTV,W@R-34M-3$R+7!C.3@N=FAD+F]U=`"METU/["`4
-MAO?S*T[BSD5#3X$R&R<QZMK$Z%TSO:UQ<=4X+ESTQ\LI,(72=APOTPZA`1[>
-M\P$$QNP/0%8@.Y`M2$'UFH/<0JT`3*-[<2A+]PE]\_;:-I\O7X7[]1L+*UDX
-M*AY.X[$";B:I`35-(O]2'7J/*2YNGR]?_CU['#J<GYA+X`C"0'@RCV)'=42Z
-MNWZXF:JK4G7C*#M/UT'5!3VJ4%U1[$(<-Z-,?WHE='R0Z=_H(VH(<9$ZP2:C
-M`IES3@V,G</)M5'GX"XW+A8V54QBU*9D($NHD>HF;;P?DM>DRM?A77\<VHD^
-M7$@5&01CVL:7S467*N@[.P6<!*Z9"P/E,,7-I,I_>4_&X[BK&"<PX1MP,#_V
-MWHB"4)\LV8K/EX.QJ$^3/K.VF)XIEQOZZR)^CL!]=QY0"-`I\-$;W)"^+8>&
-MS_G=+=DD8T:#=W%\FX7L^W5\V\S^0[TJY'R%2F56J`:%HJ8-74A0^%.%?VZ?
-M9E:PTME"8G%X"N<%A_M]C-L%N,HNN)$2)!LT)52M^PCK`>[*_CV.KZFC7:&=
-M:U@T5F1.%JTFX\(X0]E"60%3K@UCX#&^,.K;IC(P,G=%'Z3F:L+5<?\RP.$)
-M<R'&[=W)ZWM&(3SAO:M479,Y&/OIROCARB5(O'(M#O-N!'K864P&TBZ>E,L-
-M_7T1/Q:([C#*=KJA.SVR*>0.F$TA=^='1H6Z64VV<[-0.H69K@J$RWA5(%S&
-BJP+A,EX5")?QJD"XC%<%PF6]*DAS"61L\PVA;@PG7PX`````
+M'XL("*$EAE4``VEM9RTV,W@R-34M-3$R+7!C.3@N=FAD+F]U=`"METV/FS`0
+MAN_Y%2/UM@=DQA\XEXU4:>^]M'LV%%91U7:UZ6$/_/AZL!UL#&33.A!D9,_#
+M.Q^V9<;<#T!Q4`.H'I2D=B-`':'1`+;3WS@]:_\*8_?[5]_].;]7_C<>'*QF
+ML55J3O;(0=B/-("&/J*^4QO&@*D^/;T\G'^^!!QZ''J0;,B*(Z@V^XYF5W5$
+M>C[CCZ4ZGJN;K9R#PP!\B$;P6%U5G6*<L%9V/-T*6CG%)]S)2](1XQ)UDBVL
+M(IEK08V<7<.I/:M[<`\'GPM7*K8P&OMDH&IHD-JV;$(<LMN6ROOEU;Q=^H4^
+MW"@5%25CV2>VW45?*A@&>P6"!.ZY"Q/ELL2ME,I_14^E=L(W;!"8#!TXN9]&
+M;T9!K$_5;"?FV\G8U&=(G[#SS*P\MSO&SU5Z78'M<!]02C`Y\&MPN"-]1P&=
+M6(N[G[)9Q<P.G]+\=AO5]\_Y[0O'#\VND/L5:EU8H9X4VA79+NA2@<:/*GQ^
+M^K8R@[4IEA*'PUNX(#A>[U/<*<)Q-^%F2E1LT-7`>_\2MR/<H_L'G-A31ZM"
+MO]:QZ:PL7"Q&+^SB/$/=0\V!:=^'*?":7YCU'7,9F+B[HP]R=PWAFG1\'>'P
+MAKN0XEJ_\X:120IO1.\Q5]<53D:[G!D?G+D$26>NPV'9A<!,*XNM0%K%L^=V
+MQ_BE2B\'1+\9%=O=T.\>Q10*#RRF4/C]HZ!"T^T6V[U5J+S"0D<%PA4\*A"N
+CX%&!<`6/"H0K>%0@7,&C`N&*'A64/00R=O@+OHS"'5\.````
 `
 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 6726144ccb39..ffafcc7b102e 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("%\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()````
+M'XL("*(EAE4``VEM9RTV,W@R-34M-3$R+7!C.3@N=FAD9BYO=70`K94[;X,P
+M$,?W?(J3NF5`]OD!+$&JE+U+FYD0B**J[=*A`Q^^?E+;0!Z5,2$FAW_YW\,'
+M(?8`X`BD7;BN&\;G(A[C9KLQ-#H\!A0"VCGP50$-#K6^FD/'0<V2$]A@9G1F
+M&`MW-.[;XZ@RSD%NU:IAPA43SKG+,\</R54ACRLL^\P**Z-0E,`%"`D5WJOP
+ML']+%%I<MI18'-["><&N>!9P38!CRC@$3X;%!AT%UKN;<![@=O;C<?R:.A4)
+MTB\95IT5>8NE4B->%^89:`^4`:F<#6/@E%_XTU?/96#D[A5],'>WU;@R?IX&
+M.+SA+L2XH\8%^8Q2>"-ZN[FZ+G,R:+HS[MRY&A+O7(O#O(V@-IU%5:#NXK/K
+MNF%\*>)A@=P!<T60^K>;9"`'D#U(H><E!UE#685`C"MI[+X^^^[[\A-DV."H
+M;0:+IUZ/3.\660*V^D_D2<\#?4_[\_;R<?8XWZI\1U*;3:UB"/*8N$M3=P\7
+M?$_5L31(-(D>:IUAVU._1-%K0AR?G.T'.)X,SI_13618:E4&)TBRZK^YM3B9
+/N534BW?S"UK7>:L2"0``
 `
 end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
index 523a1ae8f369..a38fd79a5827 100644
--- a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
@@ -1,18 +1,18 @@
 # $FreeBSD$
 begin 644 img-63x255-512-vtoc8.vhd.gz
-M'XL("/W%'50``VEM9RTV,W@R-34M-3$R+79T;V,X+G9H9"YO=70`K9;-;MLP
-M#,?O>0H"N_5@R)0LVZ<"Z];;@`%[@<FV7!3#UJ'=H8<\_$A;CB5_K5F9"(X,
-MB3_]*5$,E1H_`%:#[<%ZL`7W2P.VAK("H,'0<'CFX17.[=,OW_YY?,W"YWP:
-M8;F*K5)SMD<-AA8I`1TO8CONPWG"9!\^/]P\_GR8<!APT\+&@D$H"&(6Z^10
-MJ8LZ)MU__/9IJ4XOU<56_*.A[T'WT0P=J\NRVQAGR(KF<[/0CS*GEKPD`S$N
-M45>HA56D=&M3(V>W</;(ZAK<S2F<Q1@J%!@E/178'$KD/H7-M`^K1J'R^O+;
-M/;_XA3[<"15[T9>OQMI]=S&$"DZ3@P**Y>;071@H/Y:X5:B\<_=L:F?238I?
-MQAFT.ZK8=]?.NX?3IE$CU:H\.HQL\%>M<*@.K(YP.^XZ=I=N*P4()Y5BOK8:
-M`33UNLW]NW_VGBXNZB^)/K<3+/]]'*Y*[/YQV2I0-2>QW>-P]6Q5O__N.B?E
-M[HAKWHJCG*$ZZ#QXO\!]CW"M\&$T*W?]$/]J2+]7N]M,[NIY\GBO*+/OX**\
-M?+O$M<E5BQO";+^A#C;5=1=<TX+1J=6ALW=;."\:*DW_5ESGH*$XR:$_R,KM
-MH8AK0P5#7A%+5"BM4'>5YV'Z*U=NX[D_</Z:I=\1:()",9<)**O0!J"80DM%
-MI*C"LJM1])2KH%"H;F:<8-W,.,&ZF7&"=3/C!.MFQ@G6S8P3K9L)2+%W^@L6
-'\>:S;`T`````
+M'XL("*4EAE4``VEM9RTV,W@R-34M-3$R+79T;V,X+G9H9"YO=70`K99-;]LP
+M#(;O^14$=NO!D"E9MD\%]M';@`$[[#K9EHM@V%JT/?20'S_2EA/)7VM6)H)C
+M0^+CEQ3%4*GQ`V`UV!ZL!UOP?6G`UE!6`#09!@[7/#S"J7WXX]N7XVL6/J?#
+M",M5;)6:LSUJ,/22$M#Q2VS']W":,-F'+_<WQ]_W$PX##@.H*-E*(]AF]IX<
+M*G56QZ0?1_PU5Z?GZF(K_M'0]Z#[:(6.U679;8PS9$7K>5AH\B$^TT@>DHD8
+MEZ@KU,PJ4KH6U,C9-9S=L[H&=W,(>S&F"B5&25<%-H<2^9[29HK#8E"JO#X_
+MNJ=G/].'&ZEBS_KRQ5R[[2Z&5,%I<5!@EJF2N@L#99XJN$B5=T;/IG8F#5+\
+M,*Z@Z*ABVUU[B1Y.0:-!JE6YMQG9X*]:X%#M6.WA-MQU[*ZQG"!<5`HP"`6=
+M?<.'%S3==:OQNWOR_N/WSZB_)OK<1K+\]W:X*K'[QV&K0-5<A#:WP]47J_K]
+M9]<Y*7='7/-6'-4,U4'GP?L9[F>$:X4WHUFXZX?\5T/YO=K=9G)77Q:/YXHJ
+M^P8NJLNW<UR;'+5X(%SL5]3!JKKNC&M:,#JUVG7VTQK.BZ9*T[\5USEH*$]R
+MZ'>J<KLKXMI4P5!7Q`H52BO47>5YFO[*E5NY;D^<OF7I=P2:H%#,90+**K0!
+M**;04A,IJK#L:A3=Y2HH%.J;&2?8-S-.L&]FG&#?S#C!OIEQ@GTSXT3[9@)2
+,[AW^`BT2KB!L#0``
 `
 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 654482e92b40..51b787606b38 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("&,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'````
+M'XL("*8EAE4``VEM9RTV,W@R-34M-3$R+79T;V,X+G9H9&8N;W5T`*V4.V_#
+M(!2%]_R*(W7+$)F'L3U%ZFNK5*E#U]H&HBAJ*U4=.OC'%XP3`\%N&ADC1`3G
+MXQYRN5GF&L`%"@J1V\XI<@;.P2C`S$S";(DZNL<OI6Y?[BE[VO2M6SD8,8OG
+M^P?5Y$*WB5JW6@_`,M"1>6")K$)&DT"'JT95]2=N+CZ'JY>RZW#-I3AA1@FI
+MH%2$>_-P[<)_!CFSJT#<A%UAEQSMLG&SUG9D>@I'1MPVQHUV::2B&/6)Z)",
+M3IYP30O.0M6LV;L43BV:*D1?BI,U&I,G!+J=QM'9(/Z;*H4L>V!N=M6)<7JA
+M>]Z$GP,V`W"I"$DY5#[!(#2$ZHL?0\$A*A2E#Z1!WJ!K/S]4^[W_\6ZPQ]G*
+M9[(WV:V>FEIJ#BE`:WN(D';NQ7?SL%OOWW=''!U<T>'@O+`J4Y1%$]DE*$.[
+MKWMZB*-C\27Y*O<&39Q,AX_&O[VMC^,GLZ8`F>=A[^?8@Q_!0BK[>ER>1:JK
+3WT:/$PNGBLF]U2]`,(]1+@<`````
 `
 end