diff --git a/README.en.md b/README.en.md index eb7a11b..001349e 100644 --- a/README.en.md +++ b/README.en.md @@ -157,7 +157,7 @@ bash reinstall.sh centos 9 openeuler 20.03|22.03|24.03 alpine 3.17|3.18|3.19|3.20 opensuse 15.5|15.6|tumbleweed - ubuntu 16.04|18.04|20.04|22.04|24.04 + ubuntu 16.04|18.04|20.04|22.04|24.04 [--minimal] kali arch gentoo @@ -273,8 +273,8 @@ Use `Dism++` File menu > Open Image File, select the iso to be installed to get #### The script will install the following drivers as needed - KVM ([Virtio](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/)) -- XEN ([XEN](https://xenproject.org/windows-pv-drivers/), [Citrix](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade), [AWS](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/xen-drivers-overview.html)) -- AWS ([ENA Network Adapter](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/enhanced-networking-ena.html), [NVMe Storage Controller](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/aws-nvme-drivers.html)) +- XEN ([XEN](https://xenproject.org/windows-pv-drivers/), [Citrix](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade), [AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/xen-drivers-overview.html)) +- AWS ([ENA Network Adapter](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ena-driver-releases-windows.html), [NVMe Storage Controller](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-driver-version-history.html)) - GCP ([gVNIC Network Adapter](https://cloud.google.com/compute/docs/networking/using-gvnic), [GGA Graphics](https://cloud.google.com/compute/docs/instances/enable-instance-virtual-display)) - Azure ([MANA Network Adapter](https://learn.microsoft.com/azure/virtual-network/accelerated-networking-mana-windows)) diff --git a/README.md b/README.md index 79921a8..5a2f016 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ bash reinstall.sh centos 9 openeuler 20.03|22.03|24.03 alpine 3.17|3.18|3.19|3.20 opensuse 15.5|15.6|tumbleweed - ubuntu 16.04|18.04|20.04|22.04|24.04 + ubuntu 16.04|18.04|20.04|22.04|24.04 [--minimal] kali arch gentoo @@ -273,8 +273,8 @@ Windows Server 2022 SERVERDATACENTER #### 脚本会按需安装以下驱动 - KVM ([Virtio](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/)) -- XEN ([XEN](https://xenproject.org/windows-pv-drivers/)、[Citrix](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade)、[AWS](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/xen-drivers-overview.html)) -- AWS ([ENA 网卡](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/enhanced-networking-ena.html)、[NVME 存储控制器](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/aws-nvme-drivers.html)) +- XEN ([XEN](https://xenproject.org/windows-pv-drivers/)、[Citrix](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade)、[AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/xen-drivers-overview.html)) +- AWS ([ENA 网卡](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ena-driver-releases-windows.html)、[NVME 存储控制器](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-driver-version-history.html)) - GCP ([gVNIC 网卡](https://cloud.google.com/compute/docs/networking/using-gvnic)、[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)) diff --git a/reinstall.sh b/reinstall.sh index 6e0325f..a9d5f80 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -43,7 +43,7 @@ Usage: $reinstall____ centos 9 openeuler 20.03|22.03|24.03 alpine 3.17|3.18|3.19|3.20 opensuse 15.5|15.6|tumbleweed - ubuntu 16.04|18.04|20.04|22.04|24.04 + ubuntu 16.04|18.04|20.04|22.04|24.04 [--minimal] kali arch gentoo @@ -879,6 +879,14 @@ setos() { [ "$basearch_alt" = amd64 ] || [ "$releasever" = 24.04 ] } + is_should_use_minimal_cloud_image() { + if [ "$minimal" = 1 ] && ! is_have_minimal_image; then + echo "Fallback to normal cloud image." + return 1 + fi + [ "$minimal" = 1 ] + } + get_suffix() { if [ "$releasever" = 16.04 ]; then if is_efi; then @@ -889,7 +897,7 @@ setos() { fi } - if is_have_minimal_image; then + if is_should_use_minimal_cloud_image; then eval ${step}_img="$ci_mirror/minimal/releases/$codename/release/ubuntu-$releasever-minimal-cloudimg-$basearch_alt$(get_suffix).img" else eval ${step}_img="$ci_mirror/releases/$releasever/release/ubuntu-$releasever-server-cloudimg-$basearch_alt$(get_suffix).img" @@ -2805,7 +2813,7 @@ else fi # 整理参数 -if ! opts=$(getopt -n $0 -o "" --long ci,debug,hold:,sleep:,iso:,image-name:,img:,lang:,commit:,force: -- "$@"); then +if ! opts=$(getopt -n $0 -o "" --long ci,debug,minimal,hold:,sleep:,iso:,image-name:,img:,lang:,commit:,force: -- "$@"); then usage_and_exit fi @@ -2825,6 +2833,10 @@ while true; do cloud_image=1 shift ;; + --minimal) + minimal=1 + shift + ;; --hold | --sleep) hold=$2 if ! { [ "$hold" = 1 ] || [ "$hold" = 2 ]; }; then