From 9521e84703b2e5e380f2e4ae03549aa4c9dda4ba Mon Sep 17 00:00:00 2001 From: bin456789 Date: Sun, 10 Aug 2025 08:02:22 +0800 Subject: [PATCH] =?UTF-8?q?debian:=20=E6=94=AF=E6=8C=81=2013?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 4 ++-- README.md | 4 ++-- debian.cfg | 2 +- reinstall.sh | 10 +++++++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.en.md b/README.en.md index 062f448..3ba6b9c 100644 --- a/README.en.md +++ b/README.en.md @@ -32,7 +32,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 | -| Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 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.04 | 512 MB \* | 2 GB | | Anolis | 7, 8, 23 | 512 MB \* | 5 GB | @@ -133,7 +133,7 @@ bash reinstall.sh anolis 7|8|23 centos 9|10 fedora 41|42 nixos 25.05 - debian 9|10|11|12 + debian 9|10|11|12|13 opensuse 15.6|tumbleweed alpine 3.19|3.20|3.21|3.22 openeuler 20.03|22.03|24.03|25.03 diff --git a/README.md b/README.md index 7413c12..897b2e9 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ | 系统 | 版本 | 内存 | 硬盘 | | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ------------ | | Alpine | 3.19, 3.20, 3.21, 3.22 | 256 MB | 1 GB | -| Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 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.04 | 512 MB \* | 2 GB | | Anolis | 7, 8, 23 | 512 MB \* | 5 GB | @@ -133,7 +133,7 @@ bash reinstall.sh anolis 7|8|23 centos 9|10 fedora 41|42 nixos 25.05 - debian 9|10|11|12 + debian 9|10|11|12|13 opensuse 15.6|tumbleweed alpine 3.19|3.20|3.21|3.22 openeuler 20.03|22.03|24.03|25.03 diff --git a/debian.cfg b/debian.cfg index ce24257..24b8667 100644 --- a/debian.cfg +++ b/debian.cfg @@ -2,7 +2,7 @@ # shellcheck disable=SC1091,SC2148 # https://www.debian.org/releases/stable/amd64/apbs04.zh-cn.html # https://www.debian.org/releases/stable/example-preseed.txt -# https://preseed.debian.net/debian-preseed/bookworm/amd64-main-full.txt +# https://preseed.debian.net/debian-preseed/trixie/amd64-main-full.txt # 需要留意 kali initrd 自带的 /preseed.cfg # 下面这行语句无效，因为本行后面有反斜杠，前面有空格（安装器认为不算注释）\ diff --git a/reinstall.sh b/reinstall.sh index 2ce3a1a..82b38d9 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -53,7 +53,7 @@ Usage: $reinstall_____ anolis 7|8|23 centos 9|10 fedora 41|42 nixos 25.05 - debian 9|10|11|12 + debian 9|10|11|12|13 opensuse 15.6|tumbleweed alpine 3.19|3.20|3.21|3.22 openeuler 20.03|22.03|24.03|25.03 @@ -1118,6 +1118,9 @@ setos() { 10) codename=buster ;; 11) codename=bullseye ;; 12) codename=bookworm ;; + 13) codename=trixie ;; + 14) codename=forky ;; + 15) codename=duke ;; esac if ! is_use_cloud_image && is_debian_elts && is_in_china; then @@ -1838,7 +1841,7 @@ verify_os_name() { 'oracle 8|9' \ 'fedora 41|42' \ 'nixos 25.05' \ - 'debian 9|10|11|12' \ + 'debian 9|10|11|12|13' \ 'opensuse 15.6|16.0|tumbleweed' \ 'alpine 3.19|3.20|3.21|3.22' \ 'openeuler 20.03|22.03|24.03|25.03' \ @@ -3122,6 +3125,7 @@ partman-xfs rescue-check wpasupplicant-udeb lilo-installer +systemd-boot-installer nic-modules-$kver-di nic-pcmcia-modules-$kver-di nic-usb-modules-$kver-di @@ -3172,7 +3176,7 @@ EOF fi # 下载 udeb - curl -Lo $tmp/tmp.udeb http://$nextos_udeb_mirror/"$(grep /$package $udeb_list)" + curl -Lo $tmp/tmp.udeb http://$nextos_udeb_mirror/"$(grep -F /${package}_ $udeb_list)" if false; then # 使用 dpkg