From e3ed8703ab6ee96122f4089f25673ecbbb8e69e8 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Fri, 16 May 2025 19:06:09 +0800 Subject: [PATCH] =?UTF-8?q?redhat:=20=E4=B8=8D=E9=9C=80=E8=A6=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 +- README.md | 2 +- reinstall.sh | 14 ++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.en.md b/README.en.md index a0086b4..0c47ff5 100644 --- a/README.en.md +++ b/README.en.md @@ -128,7 +128,6 @@ certutil -urlcache -f -split https://cnb.cool/bin456789/reinstall/-/git/raw/main bash reinstall.sh anolis 7|8|23 opencloudos 8|9|23 rocky 8|9 - redhat 8|9 --img="http://xxx.com/xxx.qcow2" oracle 8|9 almalinux 8|9 centos 9|10 @@ -144,6 +143,7 @@ bash reinstall.sh anolis 7|8|23 gentoo aosc fnos + redhat --img="http://access.cdn.redhat.com/xxx.qcow2" ``` #### Optional Parameters diff --git a/README.md b/README.md index d326d5a..204b340 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,6 @@ certutil -urlcache -f -split https://cnb.cool/bin456789/reinstall/-/git/raw/main bash reinstall.sh anolis 7|8|23 opencloudos 8|9|23 rocky 8|9 - redhat 8|9 --img="http://xxx.com/xxx.qcow2" oracle 8|9 almalinux 8|9 centos 9|10 @@ -144,6 +143,7 @@ bash reinstall.sh anolis 7|8|23 gentoo aosc fnos + redhat --img="http://access.cdn.redhat.com/xxx.qcow2" ``` #### 可选参数 diff --git a/reinstall.sh b/reinstall.sh index b6ee519..4f358ea 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -48,7 +48,6 @@ usage_and_exit() { Usage: $reinstall_____ anolis 7|8|23 opencloudos 8|9|23 rocky 8|9 - redhat 8|9 --img="http://xxx.com/xxx.qcow2" oracle 8|9 almalinux 8|9 centos 9|10 @@ -64,6 +63,7 @@ Usage: $reinstall_____ anolis 7|8|23 gentoo aosc fnos + redhat --img="http://access.cdn.redhat.com/xxx.qcow2" dd --img="http://xxx.com/yyy.zzz" (raw image stores in raw/vhd/tar/gz/xz/zst) windows --image-name="windows xxx yyy" --lang=xx-yy windows --image-name="windows xxx yyy" --iso="http://xxx.com/xxx.iso" @@ -1677,13 +1677,11 @@ Continue with DD? } setos_redhat() { - # el 10 需要 x86-64-v3 - if [ "$basearch" = x86_64 ] && [ "$releasever" -ge 10 ]; then - assert_cpu_supports_x86_64_v3 - fi - if is_use_cloud_image; then - # ci + # el 10 需要 x86-64-v3 + if [ "$basearch" = x86_64 ] && [[ "$img" = *rhel-10* ]]; then + assert_cpu_supports_x86_64_v3 + fi eval "${step}_img='$img'" else : @@ -1798,7 +1796,6 @@ verify_os_name() { 'opencloudos 8|9|23' \ 'almalinux 8|9' \ 'rocky 8|9' \ - 'redhat 8|9' \ 'oracle 8|9' \ 'fedora 41|42' \ 'nixos 24.11' \ @@ -1807,6 +1804,7 @@ verify_os_name() { 'alpine 3.18|3.19|3.20|3.21' \ 'openeuler 20.03|22.03|24.03|25.03' \ 'ubuntu 16.04|18.04|20.04|22.04|24.04|25.04' \ + 'redhat' \ 'kali' \ 'arch' \ 'gentoo' \