From 2f45cea46e5d8ba92f3f31f7e2639673d940ff3f Mon Sep 17 00:00:00 2001
From: longpanda <admin@ventoy.net>
Date: Mon, 11 Jan 2021 13:40:14 +0800
Subject: [PATCH] fix a bug for arm64 ubuntu-20.10-live-server-arm64.iso

---
 IMG/cpio/sbin/init                       |  9 +++++++++
 IMG/cpio/ventoy/tool/vtoytool_install.sh | 11 -----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/IMG/cpio/sbin/init b/IMG/cpio/sbin/init
index 14cf22e6..1b46128e 100644
--- a/IMG/cpio/sbin/init
+++ b/IMG/cpio/sbin/init
@@ -98,12 +98,21 @@ if [ -e $BUSYBOX_PATH/32h ]; then
         ln -s $BUSYBOX_PATH/xzminidecaa64 $BUSYBOX_PATH/xzminidec
         ln -s $VTOY_PATH/tool/dmsetupaa64 $VTOY_PATH/tool/dmsetup
         ln -s $VTOY_PATH/tool/lunzipaa64 $VTOY_PATH/tool/lunzip
+        
+        rm -f $VTOY_PATH/tool/lz4cat $VTOY_PATH/tool/zstdcat
+        ln -s $VTOY_PATH/tool/lz4cataa64 $VTOY_PATH/tool/lz4cat
+        ln -s $VTOY_PATH/tool/zstdcataa64 $VTOY_PATH/tool/zstdcat
+        
     else
         echo "Use x86_64 busybox toolkit ..." >>$VTLOG
         echo x86_64 > $VTOY_PATH/ventoy_arch
         ln -s $BUSYBOX_PATH/xzminidec64 $BUSYBOX_PATH/xzminidec
         ln -s $VTOY_PATH/tool/dmsetup64 $VTOY_PATH/tool/dmsetup
         ln -s $VTOY_PATH/tool/lunzip64 $VTOY_PATH/tool/lunzip
+        
+        rm -f $VTOY_PATH/tool/lz4cat $VTOY_PATH/tool/zstdcat
+        ln -s $VTOY_PATH/tool/lz4cat64 $VTOY_PATH/tool/lz4cat
+        ln -s $VTOY_PATH/tool/zstdcat64 $VTOY_PATH/tool/zstdcat
     fi
 else
     echo "Use i386 busybox toolkit ..." >>$VTLOG
diff --git a/IMG/cpio/ventoy/tool/vtoytool_install.sh b/IMG/cpio/ventoy/tool/vtoytool_install.sh
index fe547f19..0cf76662 100644
--- a/IMG/cpio/ventoy/tool/vtoytool_install.sh
+++ b/IMG/cpio/ventoy/tool/vtoytool_install.sh
@@ -38,20 +38,9 @@ if $GREP -q aarch64 $VTOY_PATH/ventoy_arch; then
         fi        
     done
     
-    $BUSYBOX_PATH/rm -f $VTOY_PATH/tool/lz4cat $VTOY_PATH/tool/zstdcat
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/lz4cataa64 $VTOY_PATH/tool/lz4cat
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/zstdcataa64 $VTOY_PATH/tool/zstdcat
-    
     $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/vtoy_fuse_iso_aa64  $VTOY_PATH/tool/vtoy_fuse_iso
     $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_aa64  $VTOY_PATH/tool/vtoy_unsquashfs    
 else
-    
-    if $GREP -q x86_64 $VTOY_PATH/ventoy_arch; then
-        $BUSYBOX_PATH/rm -f $VTOY_PATH/tool/lz4cat $VTOY_PATH/tool/zstdcat
-        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/lz4cat64  $VTOY_PATH/tool/lz4cat
-        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/zstdcat64 $VTOY_PATH/tool/zstdcat
-    fi
-
     for vtdir in $(ls $VTOY_PATH/tool/vtoytool/); do
         echo "try $VTOY_PATH/tool/vtoytool/$vtdir/ ..." >> $VTLOG
         if $VTOY_PATH/tool/vtoytool/$vtdir/vtoytool_64 --install 2>>$VTLOG; then