X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/8dce0adda6e1967de616287e224b914eb1bcef8e..261ddcef45ede2f9440342a5b3dd474e26df1679:/IMG/cpio/ventoy/init_chain diff --git a/IMG/cpio/ventoy/init_chain b/IMG/cpio/ventoy/init_chain index 666068f..7f78e53 100644 --- a/IMG/cpio/ventoy/init_chain +++ b/IMG/cpio/ventoy/init_chain @@ -77,12 +77,16 @@ ventoy_unpack_initramfs() { if [ "${vtx:5}" = "xzcat" ]; then rm -f $VTOY_PATH/xzlog ${vtx:5} $vtfile 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp) - if grep -q 'corrupted data' $VTOY_PATH/xzlog; then - echo 'xzcat failed, now try xzminidec...' >> $VTLOG - cat $vtfile | xzminidec | (cpio -idmu 2>>$VTLOG; cat > $vttmp) + echo 'xzcat failed, now try xzminidec...' >> $VTLOG + rm -f $VTOY_PATH/xzlog + cat $vtfile | xzminidec 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp) + + if grep -q 'limit' $VTOY_PATH/xzlog; then + echo 'xzminidec failed, now try xzcat_musl ...' >> $VTLOG + xzcat_musl $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp) + fi fi - else ${vtx:5} $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp) fi @@ -145,7 +149,7 @@ done #break here for debug if [ "$VTOY_BREAK_LEVEL" = "02" ] || [ "$VTOY_BREAK_LEVEL" = "12" ]; then - sleep 5 + sleep 5 echo -e "\n\n\033[32m ################################################# \033[0m" echo -e "\033[32m ################ VENTOY DEBUG ################### \033[0m" echo -e "\033[32m ################################################# \033[0m \n" @@ -185,7 +189,7 @@ ventoy_unpack_injection() { if [ -e $VTOY_PATH/ventoy_injection ]; then echo "### decompress injection ... ###" >>$VTLOG - ventoy_unpack_injection > $VTOY_PATH/injection.log 2>&1 + ventoy_unpack_injection > $VTOY_PATH/injection.log 2>&1 fi