diff --git a/.github/workflows/run_reinstall.yml b/.github/workflows/run_reinstall.yml index ece127f..30c0863 100644 --- a/.github/workflows/run_reinstall.yml +++ b/.github/workflows/run_reinstall.yml @@ -36,7 +36,7 @@ jobs: ${{ matrix.command }} centos --ci ${{ matrix.command }} alma --ci ${{ matrix.command }} rocky --ci - ${{ matrix.command }} fedora-38 --ci + ${{ matrix.command }} fedora-40 --ci ${{ matrix.command }} ubuntu 22.04 --ci ${{ matrix.command }} debian --ci ${{ matrix.command }} opensuse diff --git a/README.en.md b/README.en.md index 9474240..7560023 100644 --- a/README.en.md +++ b/README.en.md @@ -71,7 +71,7 @@ All features can be used on both Linux and Windows. bash reinstall.sh centos 7|8|9 (8|9 for the stream version) alma 8|9 rocky 8|9 - fedora 38|39 + fedora 38|39|40 debian 10|11|12 ubuntu 20.04|22.04 opensuse 15.5|tumbleweed @@ -194,7 +194,8 @@ Use `Dism++` File menu > Open Image File, select the iso to be installed to get | ------------------------------------- | ------------------------ | ----------- | | Debian | 256M | 512M | | Ubuntu | 1G | 512M | -| CentOS / Alma / Rocky / Fedora | 1G | 512M | +| CentOS / Alma / Rocky | 1G | 512M | +| Fedora | - | 512M | | openSUSE | - | 512M | | Alpine | 256M | - | | Arch | 512M | - | diff --git a/README.md b/README.md index 61bf966..c22960e 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ certutil -urlcache -f -split https://mirror.ghproxy.com/https://raw.githubuserco bash reinstall.sh centos 7|8|9 (8|9 为 stream 版本) alma 8|9 rocky 8|9 - fedora 38|39 + fedora 38|39|40 debian 10|11|12 ubuntu 20.04|22.04 opensuse 15.5|tumbleweed @@ -194,7 +194,8 @@ Windows Server 2022 SERVERDATACENTER | ----------------------------------- | -------- | ------ | | Debian | 256M | 512M | | Ubuntu | 1G | 512M | -| CentOS / Alma / Rocky / Fedora | 1G | 512M | +| CentOS / Alma / Rocky | 1G | 512M | +| Fedora | - | 512M | | openSUSE | - | 512M | | Alpine | 256M | - | | Arch | 512M | - | diff --git a/reinstall.sh b/reinstall.sh index 7885324..3d2c284 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -29,7 +29,7 @@ usage_and_exit() { Usage: $reinstall____ centos 7|8|9 alma 8|9 rocky 8|9 - fedora 38|39 + fedora 38|39|40 debian 10|11|12 ubuntu 20.04|22.04 alpine 3.16|3.17|3.18|3.19 @@ -961,9 +961,16 @@ setos() { ;; "rocky") ci_image=$ci_mirror/Rocky-$releasever-GenericCloud-Base.latest.$basearch.qcow2 ;; "fedora") - filename=$(curl -L $ci_mirror | grep -oP "Fedora-Cloud-Base-$releasever.*?$basearch" | head -1) - # ci_image=$ci_mirror/$filename.raw.xz - ci_image=$ci_mirror/$filename.qcow2 + # Fedora-Cloud-Base-39-1.5.x86_64.qcow2 + # Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2 + page=$(curl -L $ci_mirror) + # 40 + filename=$(grep -oP "Fedora-Cloud-Base-Generic.*?.qcow2" <<<"$page" | head -1) + # 38/39 + if [ -z "$filename" ]; then + filename=$(grep -oP "Fedora-Cloud-Base-$releasever.*?.qcow2" <<<"$page" | head -1) + fi + ci_image=$ci_mirror/$filename ;; esac @@ -1041,7 +1048,7 @@ verify_os_name() { 'centos 7|8|9' \ 'alma 8|9' \ 'rocky 8|9' \ - 'fedora 38|39' \ + 'fedora 38|39|40' \ 'debian 10|11|12' \ 'ubuntu 20.04|22.04' \ 'alpine 3.16|3.17|3.18|3.19' \ @@ -2424,7 +2431,7 @@ dd | windows | netboot.xyz | alpine | arch | gentoo) cloud_image=0 fi ;; -opensuse) +fedora | opensuse) cloud_image=1 ;; esac