diff --git a/README.en.md b/README.en.md index 948dd57..7a20f16 100644 --- a/README.en.md +++ b/README.en.md @@ -414,7 +414,7 @@ bash reinstall.sh windows \ [gcp-gvnic]: https://cloud.google.com/compute/docs/networking/using-gvnic [gcp-gga]: https://cloud.google.com/compute/docs/instances/enable-instance-virtual-display [azure-mana]: https://learn.microsoft.com/azure/virtual-network/accelerated-networking-mana-windows -[intel-vmd]: https://www.intel.com/content/www/us/en/download/720755/intel-rapid-storage-technology-driver-installation-software-with-intel-optane-memory-11th-up-to-13th-gen-platforms.html +[intel-vmd]: https://www.intel.com/content/www/us/en/download/849936/intel-rapid-storage-technology-driver-installation-software-with-intel-optane-memory-12th-to-15th-gen-platforms.html [intel-nic-7-sha1]: https://www.intel.com/content/www/us/en/download/15590/29323/intel-network-adapter-driver-for-windows-7-final-release.html [intel-nic-7-sha256]: https://www.intel.com/content/www/us/en/download/15590/intel-network-adapter-driver-for-windows-7-final-release.html [intel-nic-8]: https://www.intel.com/content/www/us/en/download/16765/intel-network-adapter-driver-for-windows-8-final-release.html diff --git a/README.md b/README.md index d1f0c93..2faadae 100644 --- a/README.md +++ b/README.md @@ -414,7 +414,7 @@ bash reinstall.sh windows \ [gcp-gvnic]: https://cloud.google.com/compute/docs/networking/using-gvnic [gcp-gga]: https://cloud.google.com/compute/docs/instances/enable-instance-virtual-display [azure-mana]: https://learn.microsoft.com/azure/virtual-network/accelerated-networking-mana-windows -[intel-vmd]: https://www.intel.com/content/www/us/en/download/720755/intel-rapid-storage-technology-driver-installation-software-with-intel-optane-memory-11th-up-to-13th-gen-platforms.html +[intel-vmd]: https://www.intel.com/content/www/us/en/download/849936/intel-rapid-storage-technology-driver-installation-software-with-intel-optane-memory-12th-to-15th-gen-platforms.html [intel-nic-7-sha1]: https://www.intel.com/content/www/us/en/download/15590/29323/intel-network-adapter-driver-for-windows-7-final-release.html [intel-nic-7-sha256]: https://www.intel.com/content/www/us/en/download/15590/intel-network-adapter-driver-for-windows-7-final-release.html [intel-nic-8]: https://www.intel.com/content/www/us/en/download/16765/intel-network-adapter-driver-for-windows-8-final-release.html diff --git a/reinstall.sh b/reinstall.sh index fb48c66..2a6a639 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -2164,7 +2164,7 @@ to_lower() { } del_cr() { - sed 's/\r//g' + sed 's/\r$//' } del_empty_lines() { diff --git a/trans.sh b/trans.sh index e3abdeb..7e401f5 100644 --- a/trans.sh +++ b/trans.sh @@ -776,7 +776,7 @@ to_lower() { } del_cr() { - sed 's/\r//g' + sed 's/\r$//' } del_comment_lines() { @@ -5456,10 +5456,11 @@ install_windows() { fi # vmd - # 改进: 像检测 virtio 那样直接从 /sys 检测设备 - # inf 有要求 19041 或以上 - if [ "$build_ver" -ge 19041 ] && [ "$arch_wim" = x86_64 ] && - is_lspci_contains 'Volume Management Device'; then + # RST v17 不支持 vmd + # RST v18 inf 要求 15063 或以上 + # RST v19 inf 要求 15063 或以上 + # RST v20 inf 要求 19041 或以上 + if [ -d /sys/module/vmd ] && [ "$build_ver" -ge 15063 ] && [ "$arch_wim" = x86_64 ]; then add_driver_vmd fi @@ -6049,7 +6050,12 @@ EOF add_driver_vmd() { apk add 7zip - download https://downloadmirror.intel.com/820815/SetupRST.exe $drv/SetupRST.exe + if [ "$build_ver" -ge 19041 ]; then + url=https://downloadmirror.intel.com/849939/SetupRST.exe # RST v20 + elif [ "$build_ver" -ge 15063 ]; then + url=https://downloadmirror.intel.com/849934/SetupRST.exe # RST v19 + fi + download $url $drv/SetupRST.exe 7z x $drv/SetupRST.exe -o$drv/SetupRST -i!.text 7z x $drv/SetupRST/.text -o$drv/vmd cp_drivers $drv/vmd