From f24906c060470e8480bcf55497d23ddd0baad05a Mon Sep 17 00:00:00 2001 From: bin456789 Date: Wed, 5 Jul 2023 21:40:00 +0800 Subject: [PATCH] =?UTF-8?q?windows:=20=E4=BF=AE=E5=A4=8D=20if=20=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E9=94=99=E8=AF=AF=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trans.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/trans.sh b/trans.sh index 28136f8..7fd8300 100644 --- a/trans.sh +++ b/trans.sh @@ -322,9 +322,9 @@ if [ "$distro" = "windows" ]; then mkdir -p $drv if virt-what | grep aws && virt-what | grep kvm && - arch_wim=x86_64; then + [ "$arch_wim" = x86_64 ]; then # aws nitro - # 只有 64 位驱动 + # 只有 x64 位驱动 # https://docs.aws.amazon.com/zh_cn/AWSEC2/latest/WindowsGuide/migrating-latest-types.html apk add unzip download https://s3.amazonaws.com/ec2-windows-drivers-downloads/NVMe/Latest/AWSNVMe.zip $drv/AWSNVMe.zip @@ -334,7 +334,7 @@ if [ "$distro" = "windows" ]; then elif virt-what | grep aws && virt-what | grep xen && - arch_wim=x86_64; then + [ "$arch_wim" = x86_64 ]; then # aws xen # 只有 64 位驱动 # 未测试 @@ -346,8 +346,10 @@ if [ "$distro" = "windows" ]; then mkdir -p $drv/aws/ cp -rf $drv/.Drivers/* $drv/aws/ - elif virt-what | grep xen; then + elif virt-what | grep xen && + [ "$arch_wim" != arm64 ]; then # xen + # 有 x86 x64，没arm64驱动 # 未测试 # https://xenbits.xenproject.org/pvdrivers/win/ ver='9.0.0' @@ -360,6 +362,7 @@ if [ "$distro" = "windows" ]; then elif virt-what | grep kvm; then # virtio + # x86 x64 arm64 都有 # https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/ case $(echo "$image_name" | tr '[:upper:]' '[:lower:]') in 'windows server 2022'*) sys=2k22 ;;