Use mkuzip(8) instead of create_compressed_fs.

5 files changed, 119 insertions, 79 deletions

diff --git a/tools/regression/geom_uzip/Makefile b/tools/regression/geom_uzip/Makefile
index bab058e..6927ff1 100644
--- a/tools/regression/geom_uzip/Makefile
+++ b/tools/regression/geom_uzip/Makefile
@@ -5,7 +5,7 @@
 #
 
 IMAGE=		test-1.img
-ZIMAGE=		${IMAGE}.gz
+ZIMAGE=		${IMAGE}.uzip
 UZIMAGE=	${ZIMAGE}.uue
 
 test:
@@ -15,7 +15,9 @@ image:
 	makefs -s 1048576 ${IMAGE} etalon
 	printf "#\n# $$" >${UZIMAGE}
 	printf "FreeBSD$$\n#\n\n" >> ${UZIMAGE}
-	create_compressed_fs ${IMAGE} 65536 | uuencode ${ZIMAGE} >>${UZIMAGE}
+	mkuzip -o ${ZIMAGE} ${IMAGE}
+	uuencode ${ZIMAGE} ${ZIMAGE} >>${UZIMAGE}
+	rm ${ZIMAGE}
 
 clean:
 	rm -f ${IMAGE} ${ZIMAGE}
diff --git a/tools/regression/geom_uzip/test-1.img.gz.uue b/tools/regression/geom_uzip/test-1.img.gz.uue
deleted file mode 100644
index 4ba70e9..0000000
--- a/tools/regression/geom_uzip/test-1.img.gz.uue
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# $FreeBSD$
-#
-
-begin 664 test-1.img.gz
-M(R$O8FEN+W-H"B-6,BXP($9O<FUA=`II;G-M;V0@8VQO;W`N;R!F:6QE/20P
-M("8F(&UO=6YT("UR("UT(&ES;SDV-C`@+V1E=B]C;&]O<"`D,0IE>&ET("0_
-M"@```````````````````````````````````````````````````0``````
-M$0````````$8````````!E(````````&I@````````;Z````````!TX`````
-M```'H@````````?V````````"$H````````(G@````````CR````````"48`
-M```````)F@````````GN````````"D(````````*E@````````KJ````````
-M"T4````````+F7C:[=U-;]Q$&,!Q;Q+H8H'$@0-((&;;"EJ4["9]$6%!(B]-
-M0:52I#90.(&].[MV8GLBCYW-]D(Y(U3N7#EP0*A"%>+`@0/B*W#AP)$/`5IF
-MO-[NIFJA51I:PO\GS=IKS\PSGK$GFW6L.`X``````````````#@LGC;I69.$
-M22?*;0/CS.?/+SLSCO/+M.-4G#*#>5\UB\?*?&_8E]\&`^>/P>`IL^HZP_WV
-MQ10;EJM.!#/K2V8Q-?&^4J[:>-VU3[>*-LR4:52^S&?34KG?UG'5I,51717G
-M&J.)A^+[:M7YH3H^T\4CU+:R+:-K[FJY7+S/:HKYP!E?EW9><";FC`.U5%[W
-M_[)J.<?9OAM\7*E432,&+Y9SY/0XWVAN&MEXKL(U`0``````````@(>"^__`
-M/G'__V`M<?\?````````````^"?O3CUQZ[Y>Q=YAN]-]=>?>[_%]9=+7)GUC
-MTG<F!17'.6/2^R9=VU=+!WO?/31_WTI[U^_'^RH!``````````````#VX\_E
-M\@'>\L'HT=]!_'Q][_+D/N.,GKO^?7J8QO&G[AC_YO6]R]D#BO_E)\-GE)/R
-M>>X;9;P;M\5_99_Q9^X2_V89_X7R_1=EO/7/]B[G#NCX1_%?*M]_>Y?X]0..
-M/SJ^V\=]M&P<4'P`````````````A\>=GO,'\/^Y_I]T9BKU\?I4O3[\OQUF
-M?7KUO<O%WV[\6JFZ,O,BE=2SW8Q^`PZ#8^XQ<?Q\*N7*Y7--H=-6(U,JTHU4
-M=E.I=:B21E>J^,/\:KC=&$X`C?$\,+LC%NH+XM3\_)G&_&)CX;28?ZUY]G3S
-M["G1V512K.UNB^/N,=>]L+RRLG;IROKJ.Q^X[D79"[58]=)419%[HI.J6&P$
-MJ<J[@<@"*2XJM14FW;FW(D]KX25M<27P,K$<A2TISJO<;-@(9"IGQ<+BJZ=.
-MNNY'&SU/"S\-HRCLSA8E;#TZ"K.@+S*U([5[+FR+;C^5Q=YN&/N1%&%2Y.MY
-MOFRZRU$DXC#6?=$S=1<[?)6JKBT]ZRZ7=<8JEB+ULD`+E6?=U!2MN^[1%=GS
-MRD(7/-^7:4^UMF9%W!=:)377-%=L>CUM,I@#\</,M-WF;46W-K:\K!74W,F*
-M<G\S]TWNM#T\)AWD25%5)\WC4.5:K)C-,M5)4?:HZ[YM2IK.$X'IWQV5;GN1
-MT#V5MNV1!B9OT[VHDJ[(PG@8(O:277M`'3-6ML/L$&1B;LZ]K(09_DRV[6:_
-M7V3>R.,LCT5F3I9A?V@3JRV\7A".^K(H;_K#[#5-UG9CWNF$.ACM*Z+88K/%
-M@4SV5<\,EI!]:3JV(SJ1%YLHJ^95F/H[G2BT[9XX2;(\ZDHS5D5=MC5^GIHQ
-M;1=A;7?&LN:ZZXGMZ9ZJB?':<"B'-7GC]:)!9:?YD=<V@662"9V$K2V9SIE.
-M;FW5;`]'LI/9$&WIE0-3-#W,M#DZKVVS%"6[7I3'VX%MN&_*VM.DZ)?`TT5W
-MF//3*\_`<3^\Z:[:`<F4/7>\--;%2>1++[:]Z*M^S5TWX^_YFW;\VUZ_9BZD
-M*%(J&*Z8#2_;%K0"E6:V.^S(F[-A4_7K#^1">7T_%PKS+?`HF;[+YW_[O_V>
-M=JHSEY0J/NT_;M(S3M6])+>5#C.5]AWGB-GV4Z5Z9"W)TE!J.A/XCVG*W:R9
-MM';T7,=\KO-UN]D(S$_NAMW$CVO@<+NGW_B9"(!#:>++O,9"?:%Q/@W%<MX5
-MDU_E%5_O-=QS3`,```````````````````````````````#`@_47N".MV'C:
-M[<$!`0```("0_J_N"`H`````````````````````````````````````````
-M``````````````````````````````````````````!J``\``7C:[<$!`0``
-M`("0_J_N"`H`````````````````````````````````````````````````
-M``````````````````````````````````!J``\``7C:[<$!`0```("0_J_N
-M"`H`````````````````````````````````````````````````````````
-M``````````````````````````!J``\``7C:[<$!`0```("0_J_N"`H`````
-M````````````````````````````````````````````````````````````
-M``````````````````!J``\``7C:[<$!`0```("0_J_N"`H`````````````
-M````````````````````````````````````````````````````````````
-M``````````!J``\``7C:[<$!`0```("0_J_N"`H`````````````````````
-M````````````````````````````````````````````````````````````
-M``!J``\``7C:[<$!`0```("0_J_N"`H`````````````````````````````
-M``````````````````````````````````````````````````````!J``\`
-M`7C:[<$!`0```("0_J_N"`H`````````````````````````````````````
-M``````````````````````````````````````````````!J``\``7C:[<$!
-M`0```("0_J_N"`H`````````````````````````````````````````````
-M``````````````````````````````````````!J``\``7C:[<$!`0```("0
-M_J_N"`H`````````````````````````````````````````````````````
-M``````````````````````````````!J``\``7C:[<$!`0```("0_J_N"`H`
-M````````````````````````````````````````````````````````````
-M``````````````````````!J``\``7C:[<$!`0```("0_J_N"`H`````````
-M````````````````````````````````````````````````````````````
-M``````````````!J``\``7C:[<$!`0```("0_J_N"`H`````````````````
-M````````````````````````````````````````````````````````````
-M``````!J``\``7C:[<$!`0```("0_J_N"`H`````````````````````````
-M``````````````````````````````````````````````````````````!J
-M``\``7C:[=!!$0``#`(@HQO="GOO(`()````````````````````````````
-M``````````````````````````````````````````````````````#`6U5P
-M-Y:/`(%XVNW!`0$```"`D/ZO[@@*````````````````````````````````
-M````````````````````````````````````````````````````:@`/``$`
-`
-end
diff --git a/tools/regression/geom_uzip/test-1.img.uzip.uue b/tools/regression/geom_uzip/test-1.img.uzip.uue
new file mode 100644
index 0000000..ca16f47
--- /dev/null
+++ b/tools/regression/geom_uzip/test-1.img.uzip.uue
@@ -0,0 +1,110 @@
+#
+# $FreeBSD$
+#
+
+begin 755 test-1.img.uzip
+M(R$O8FEN+W-H"B-6,BXP($9O<FUA=`IM/6=E;VU?=7II<`HH:VQD<W1A="`M
+M;2`D;2`R/B8M?'QK;&1L;V%D("1M*3XF+28F;6]U;G1?8V0Y-C8P("]D978O
+M8&UD8V]N9FEG("UA9B`D,&`N=7II<"`D,0IE>&ET("0_"@```````$``````
+M0`````````*0`````````W<````````$F@````````AQ````````")@`````
+M```(OP````````CF````````"0T````````)-`````````E;````````"8(`
+M```````)J0````````G0````````"?<````````*'@````````I%````````
+M"FP````````*DP````````JZ````````"N$````````+"`````````LO````
+M````"U8````````+?0````````ND````````"\L````````+\@````````P9
+M````````#$`````````,9P````````R.````````#+4````````,W```````
+M``T#````````#2H````````-40````````UX````````#9\````````-Q@``
+M``````WM````````#A0````````..P````````YB````````#HD````````.
+ML`````````[7````````#OX````````/)0````````],````````#W,`````
+M```/F@````````_!````````#^@````````0#P```````!`V````````$%T`
+M```````0A````````!"K````````$-(````````0^0```````!$@````````
+M$4<````````1;@```````!&5````````$<%XVNW4/0K",!3`\1>M$`3!42<[
+M>@1!AX)X`^_@X`VZZ.[%''1V]0+>0(@O[0OMZF`5^?_@-6GS2=L\$0``````
+M````````\"_&&A.-7&-NSX)Z7)=KR41N?1$GUD'OO18#Z[>*EWL(\@QAI-6A
+MU.WQHL/J<;ZUF-8++7JM>V?5N-YN<]I7>\@LTGCK%Z.P]CA'J;%(<SDY\C7Q
+M%6?OY>*;/SW_H;W97M*9*ZU<O#E-E0^D.9<Q+T@K9WQ48>>^8]YR7'QWX>"<
+MUTV$F>7(?M,OY:9D.W6<"0```````````'3J!63?'NAXVNW9,4I#01#&\6^3
+M"*L@6&IE2@]@$=#B@7@#!6^@X`W2F-Z+6(BEM:6%UK9>P!L(ZTS>K"^"B"&8
+M6/Q_,&]W\W8W0\A.LU)KRV+;8FBQ%Y\5\_9\<*2!]-*7DF*"C;,U:S'OT!^O
+MI>B]E$WK;JA][P];UJ[+ZEB_L:8W,T[1]>\[/[Z^G.8PB*CK8YY'$^]]C['%
+MJ.Z5-!&P"H\YZREW__3A/\HM<JEG;ASM:,YMIO5`W;GTNJ"9FO&GFCCW2Y:C
+MQOEO5ZY2RI9$V8T:V>_FU=I4G>PDS@0```````````"6[K2W_GFOE_R&[;M[
+M=?W^CN_&XM;BSN+>XB))^Q9G%I.%,BU?1ROS<Y9^Z_<PUPH`````````````
+M`!;S`6\CL0=XVNV:SVXC-1S'TS^PE<6!`T>0?MFN%A8EF:;+BI(]H"1M04NE
+M2FW%BA-X,IX9MYYQ9'LZS=[V`1`OP0-PV$=`W+ARX@&X\`A(_.Q)2:A8@50J
+M0??WD:9V//[Y:W]_GLETVE;KU>:WX5I366V*7W]\//;E#]^\/5PN'UQ39SY\
+MZY>UYECHK_ZE_HNY[F79N2'];Y^OA+)<;S[_--?_[HK^^]?47W^)_HNY_CNM
+M/^L??MWH7I;=&UK_I?[]O]'OW;!^]XK^U?Q'-Z1/$`1!$`1!$`1!$`1!$`1!
+M$`1!$,3MP?]=\!D>.V0%0;R2U_\;K?65WJ*^VL,/:TU];?SY<?C?C9]7-IAP
+M7.FRYRX<^480MX%-M@GW]HT0H^/=`5@SB9S6RD9&9$98*W4994(77U;/Y#1J
+M;@#1XC[0.8=^KP_;6UL?1%L[4?\A;'TT>/1P\&@;TE,M8.]B"O?8)F-/AJ/1
+MWM'3P_%G7S!V(&II8<R-T4JQ]U*C"SC)C:ZR'%PNX$#K,UEFW4\4MQ9XF<#3
+MG#L8*CD1L*\K;#C)A1$=Z.]\N/V`L:].:FXA-E(IF75"A!_'*NGR&3A]+BS;
+ME0ED,R/"V4P6L1(@R]"OYK$8L*%24,C"SJ#&L<.)6!N=^>@.&\['+'0AP'"7
+M6]"5RPR&]AB[.Q(UGP<]X7$L3*TG9QTH9F!UV68X73CEM<4.N)!8.IR[[SM1
+M?S1.N)OD;;8\4!6?5C'V-DFS)IM791@J-54A=65AA,W"V#+$WF7L4XQ$\R!'
+M?\^UF7(%MM8F\2O-L>^`'>@R`R>+1J+@Y85?4(JY\H;Y%#CH=MFQ!DR_$XEO
+MCF>A\TE5N*H`AYNE\<.B5@*\SN6EER$>_<"S.&7K&ZLTE3:_/!=4?%@G+&39
+MJQJ3!6(FT-@44L4+5!GC3\#QTU1)/^^E3>(JE0G,51C+SR:N#.8T";+>SD*T
+M&3LLO=.U;L.BUJ2R&8DOZF%"<]-BQ1,4%J4#6\K)F3!=-'ERUO8.*Y$Z+Y$(
+M/D],F+IT%E?'$]\E1&9<5<4T]Q./,=9OD^!+SFVP`_<GG^_`A0\?L[%/B--^
+M[W!3V+")8L$+[V*L9VUVB/GG\:G/?\)G;;R0E-(Z;RK8\*Z?P237QGD[?.9Q
+M-YSJ6>]?N5`>7^="H?LM0?R76'O)\_]K6'^SM;%^I'5XVG\=C[=:&^Q(3+65
+M3IM9JW4'V[Y?V;BS5SHCA24S">)_QD!<N$$Y.;?=%)_K8IL,HAR_N2/?1%_7
+M!'&[^4>_\=.-@"!N)4LO\Z)^KQ_M&PG#*H/E5WGA]5[$=NDV0!"WB]\!34_J
+M#GC:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
+M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
+M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
+M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
+M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
+M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
+M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
+M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
+M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
+M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
+M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
+M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
+M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
+M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
+M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
+M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
+M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
+M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
+M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
+M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
+M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
+M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
+M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
+M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
+M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
+M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
+M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
+M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
+M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
+M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
+M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
+M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
+M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
+M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
+M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
+M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
+M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
+M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
+M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
+M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
+M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
+M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
+M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
+M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
+M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
+M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
+M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
+M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
+M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
+M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
+M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
+M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
+M`7C:[=`Q`0``#`(@HQO="GOV0002````````````````````>%$%=P/6@`"!
+M````````````````````````````````````````````````````````````
+2````````````````````````
+`
+end
diff --git a/tools/regression/geom_uzip/test-1.sh b/tools/regression/geom_uzip/test-1.sh
index 6e91449..7e8f168 100644
--- a/tools/regression/geom_uzip/test-1.sh
+++ b/tools/regression/geom_uzip/test-1.sh
@@ -8,8 +8,8 @@ mntpoint="/mnt/test-1"
 #
 # prepare
 kldload geom_uzip
-uudecode test-1.img.gz.uue
-num=`mdconfig -an -f test-1.img.gz` || exit 1
+uudecode test-1.img.uzip.uue
+num=`mdconfig -an -f test-1.img.uzip` || exit 1
 sleep 1
 
 #
@@ -32,4 +32,5 @@ fi
 umount "${mntpoint}"
 rmdir "${mntpoint}"
 mdconfig -d -u ${num}
+sleep 1
 kldunload geom_uzip
diff --git a/tools/regression/geom_uzip/test-2.sh b/tools/regression/geom_uzip/test-2.sh
index 0a9b684..8662827 100644
--- a/tools/regression/geom_uzip/test-2.sh
+++ b/tools/regression/geom_uzip/test-2.sh
@@ -6,8 +6,8 @@
 #
 # prepare
 kldload geom_uzip
-uudecode test-1.img.gz.uue
-num=`mdconfig -an -f test-1.img.gz` || exit 1
+uudecode test-1.img.uzip.uue
+num=`mdconfig -an -f test-1.img.uzip` || exit 1
 sleep 1
 
 #