diff --git a/README.en.md b/README.en.md index 2fcaf14..62f990f 100644 --- a/README.en.md +++ b/README.en.md @@ -46,7 +46,7 @@ The system requirements for the target system are as follows: | System | Version | Memory | Disk | | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ---------------- | -| Alpine | 3.19, 3.20, 3.21, 3.22 | 256 MB | 1 GB | +| Alpine | 3.20, 3.21, 3.22, 3.23 | 256 MB | 1 GB | | Debian | 9, 10, 11, 12, 13 | 256 MB | 1 ~ 1.5 GB ^ | | Kali | Rolling | 256 MB | 1 ~ 1.5 GB ^ | | Ubuntu | 16.04 LTS - 24.04 LTS, 25.10 | 512 MB \* | 2 GB | @@ -57,11 +57,11 @@ The system requirements for the target system are as follows: | Fedora | 42, 43 | 512 MB \* | 5 GB | | openEuler | 20.03 LTS - 24.03 LTS, 25.09 | 512 MB \* | 5 GB | | openSUSE | Leap 15.6, 16.0, Tumbleweed (Rolling) | 512 MB \* | 5 GB | -| NixOS | 25.05 | 512 MB | 5 GB | +| NixOS | 25.11 | 512 MB | 5 GB | | Arch | Rolling | 512 MB | 5 GB | | Gentoo | Rolling | 512 MB | 5 GB | | AOSC OS | Rolling | 512 MB | 5 GB | -| fnOS | Beta | 512 MB | 8 GB | +| fnOS | 1 | 512 MB | 8 GB | | Windows (DD) | Any | 512 MB | Depends on image | | Windows (ISO) | Vista, 7, 8.x (Server 2008 - 2012 R2) | 512 MB | 25 GB | | Windows (ISO) | 10, 11 (Server 2016 - 2025) | 1 GB | 25 GB | @@ -159,10 +159,11 @@ bash reinstall.sh anolis 7|8|23 almalinux 8|9|10 opencloudos 8|9|23 centos 9|10 + fnos 1 + nixos 25.11 fedora 42|43 - nixos 25.05 debian 9|10|11|12|13 - alpine 3.19|3.20|3.21|3.22 + alpine 3.20|3.21|3.22|3.23 opensuse 15.6|16.0|tumbleweed openeuler 20.03|22.03|24.03|25.09 ubuntu 16.04|18.04|20.04|22.04|24.04|25.10 [--minimal] @@ -170,7 +171,6 @@ bash reinstall.sh anolis 7|8|23 arch gentoo aosc - fnos redhat --img="http://access.cdn.redhat.com/xxx.qcow2" ``` diff --git a/README.md b/README.md index ed64b68..436e5cd 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ | 系统 | 版本 | 内存 | 硬盘 | | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ------------ | -| Alpine | 3.19, 3.20, 3.21, 3.22 | 256 MB | 1 GB | +| Alpine | 3.20, 3.21, 3.22, 3.23 | 256 MB | 1 GB | | Debian | 9, 10, 11, 12, 13 | 256 MB | 1 ~ 1.5 GB ^ | | Kali | 滚动 | 256 MB | 1 ~ 1.5 GB ^ | | Ubuntu | 16.04 LTS - 24.04 LTS, 25.10 | 512 MB \* | 2 GB | @@ -57,11 +57,11 @@ | Fedora | 42, 43 | 512 MB \* | 5 GB | | openEuler | 20.03 LTS - 24.03 LTS, 25.09 | 512 MB \* | 5 GB | | openSUSE | Leap 15.6, 16.0, Tumbleweed (滚动) | 512 MB \* | 5 GB | -| NixOS | 25.05 | 512 MB | 5 GB | +| NixOS | 25.11 | 512 MB | 5 GB | | Arch | 滚动 | 512 MB | 5 GB | | Gentoo | 滚动 | 512 MB | 5 GB | | 安同 OS | 滚动 | 512 MB | 5 GB | -| 飞牛 fnOS | 公测 | 512 MB | 8 GB | +| 飞牛 fnOS | 1 | 512 MB | 8 GB | | Windows (DD) | 任何 | 512 MB | 取决于镜像 | | Windows (ISO) | Vista, 7, 8.x (Server 2008 - 2012 R2) | 512 MB | 25 GB | | Windows (ISO) | 10, 11 (Server 2016 - 2025) | 1 GB | 25 GB | @@ -159,10 +159,11 @@ bash reinstall.sh anolis 7|8|23 almalinux 8|9|10 opencloudos 8|9|23 centos 9|10 + fnos 1 + nixos 25.11 fedora 42|43 - nixos 25.05 debian 9|10|11|12|13 - alpine 3.19|3.20|3.21|3.22 + alpine 3.20|3.21|3.22|3.23 opensuse 15.6|16.0|tumbleweed openeuler 20.03|22.03|24.03|25.09 ubuntu 16.04|18.04|20.04|22.04|24.04|25.10 [--minimal] @@ -170,7 +171,6 @@ bash reinstall.sh anolis 7|8|23 arch gentoo aosc - fnos redhat --img="http://access.cdn.redhat.com/xxx.qcow2" ``` diff --git a/reinstall.sh b/reinstall.sh index bd46ad4..5f3243a 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -64,10 +64,11 @@ Usage: $reinstall_____ anolis 7|8|23 oracle 8|9|10 almalinux 8|9|10 centos 9|10 + fnos 1 + nixos 25.11 fedora 42|43 - nixos 25.05 debian 9|10|11|12|13 - alpine 3.19|3.20|3.21|3.22 + alpine 3.20|3.21|3.22|3.23 opensuse 15.6|16.0|tumbleweed openeuler 20.03|22.03|24.03|25.09 ubuntu 16.04|18.04|20.04|22.04|24.04|25.10 [--minimal] @@ -75,7 +76,6 @@ Usage: $reinstall_____ anolis 7|8|23 arch 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 @@ -920,7 +920,7 @@ get_windows_iso_link() { esac ;; homebasic | homepremium | ultimate) echo _ ;; - business | enterprise) "$edition" ;; + business | enterprise) echo "$edition" ;; esac ;; 7) @@ -1918,11 +1918,12 @@ verify_os_name() { 'almalinux 8|9|10' \ 'rocky 8|9|10' \ 'oracle 8|9|10' \ + 'fnos 1' \ 'fedora 42|43' \ - 'nixos 25.05' \ + 'nixos 25.11' \ 'debian 9|10|11|12|13' \ 'opensuse 15.6|16.0|tumbleweed' \ - 'alpine 3.19|3.20|3.21|3.22' \ + 'alpine 3.20|3.21|3.22|3.23' \ 'openeuler 20.03|22.03|24.03|25.09' \ 'ubuntu 16.04|18.04|20.04|22.04|24.04|25.10' \ 'redhat' \ @@ -1930,7 +1931,6 @@ verify_os_name() { 'arch' \ 'gentoo' \ 'aosc' \ - 'fnos' \ 'windows' \ 'dd' \ 'netboot.xyz'; do diff --git a/trans.sh b/trans.sh index 1cfda61..fdd088b 100644 --- a/trans.sh +++ b/trans.sh @@ -1630,9 +1630,9 @@ install_nixos() { fi # 备用方案 - # 1. 从 https://mirror.nju.edu.cn/nix-channels/nixos-25.05/nixexprs.tar.xz 获取 - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/tools/package-management/nix/default.nix - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/installer/tools/nix-fallback-paths.nix + # 1. 从 https://mirror.nju.edu.cn/nix-channels/nixos-25.11/nixexprs.tar.xz 获取 + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/pkgs/tools/package-management/nix/default.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/installer/tools/nix-fallback-paths.nix # 2. 安装最新版 nix,添加 nixos channel 后获取 # nix eval -f '' --raw 'nixVersions.stable.version' --extra-experimental-features nix-command @@ -2756,14 +2756,6 @@ mount_pseudo_fs() { fi } -get_yq_name() { - if grep -q '3\.1[6789]' /etc/alpine-release; then - echo yq - else - echo yq-go - fi -} - create_cloud_init_network_config() { ci_file=$1 recognize_static6=${2:-true} @@ -2775,7 +2767,7 @@ create_cloud_init_network_config() { mkdir -p "$(dirname "$ci_file")" touch "$ci_file" - apk add "$(get_yq_name)" + apk add yq-go need_set_dns4=false need_set_dns6=false @@ -2889,7 +2881,7 @@ create_cloud_init_network_config() { yq -i "del(.network.config[$config_id] | select(has(\"address\") | not))" $ci_file fi - apk del "$(get_yq_name)" + apk del yq-go # 查看文件 info "Cloud-init network config"