From 662e4d9eb5e39f898a987f43d9a7f160706d0268 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Fri, 19 Jun 2026 10:53:30 +0800 Subject: [PATCH] =?UTF-8?q?core:=20=E7=A7=BB=E5=8A=A8=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=B0=20deprecated=20=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 9 ++++++--- README.md | 9 ++++++--- .../cloud-init-fix-onlink.sh | 0 cloud-init.yaml => deprecated/cloud-init.yaml | 0 redhat.cfg => deprecated/redhat.cfg | 2 +- resize.sh => deprecated/resize.sh | 0 .../ubuntu-storage-early.sh | 0 ubuntu.yaml => deprecated/ubuntu.yaml | 4 ++-- reinstall.sh | 4 ++-- trans.sh | 4 ++-- 10 files changed, 19 insertions(+), 13 deletions(-) rename cloud-init-fix-onlink.sh => deprecated/cloud-init-fix-onlink.sh (100%) rename cloud-init.yaml => deprecated/cloud-init.yaml (100%) rename redhat.cfg => deprecated/redhat.cfg (99%) rename resize.sh => deprecated/resize.sh (100%) rename ubuntu-storage-early.sh => deprecated/ubuntu-storage-early.sh (100%) rename ubuntu.yaml => deprecated/ubuntu.yaml (96%) diff --git a/README.en.md b/README.en.md index 8f89f48..185d755 100644 --- a/README.en.md +++ b/README.en.md @@ -199,7 +199,7 @@ bash reinstall.sh anolis 7|8|23
-Experimental Features +Deprecated Features Install Debian using a cloud image @@ -212,16 +212,19 @@ bash reinstall.sh debian --ci Install CentOS, AlmaLinux, Rocky, Fedora using ISO - Only supports machines with more than 2G of memory and dynamic IP. -- Password is `123@@@`, and the SSH port is `22`; modifying them using parameters is not supported. +- Username is `root`, Password is `123@@@`, and the SSH port is `22`; modifying them using parameters is not supported. ```bash bash reinstall.sh centos --installer +bash reinstall.sh almalinux --installer +bash reinstall.sh rocky --installer +bash reinstall.sh fedora --installer ``` Install Ubuntu using ISO - Only supports machines with more than 1G of memory and dynamic IP. -- Password is `123@@@`, and the SSH port is `22`; modifying them using parameters is not supported. +- Username is `root`, Password is `123@@@`, and the SSH port is `22`; modifying them using parameters is not supported. ```bash bash reinstall.sh ubuntu --installer diff --git a/README.md b/README.md index 487b0c7..c343c4f 100644 --- a/README.md +++ b/README.md @@ -199,7 +199,7 @@ bash reinstall.sh anolis 7|8|23
-实验性功能 +已弃用的功能 云镜像安装 Debian @@ -212,16 +212,19 @@ bash reinstall.sh debian --ci ISO 安装 CentOS, AlmaLinux, Rocky, Fedora - 仅支持内存大于 2G 且为动态 IP 的机器 -- 密码 `123@@@`，SSH 端口 `22`，不支持用参数修改 +- 用户名 `root`，密码 `123@@@`，SSH 端口 `22`，不支持用参数修改 ```bash bash reinstall.sh centos --installer +bash reinstall.sh almalinux --installer +bash reinstall.sh rocky --installer +bash reinstall.sh fedora --installer ``` ISO 安装 Ubuntu - 仅支持内存大于 1G 且为动态 IP 的机器 -- 密码 `123@@@`，SSH 端口 `22`，不支持用参数修改 +- 用户名 `root`，密码 `123@@@`，SSH 端口 `22`，不支持用参数修改 ```bash bash reinstall.sh ubuntu --installer diff --git a/cloud-init-fix-onlink.sh b/deprecated/cloud-init-fix-onlink.sh similarity index 100% rename from cloud-init-fix-onlink.sh rename to deprecated/cloud-init-fix-onlink.sh diff --git a/cloud-init.yaml b/deprecated/cloud-init.yaml similarity index 100% rename from cloud-init.yaml rename to deprecated/cloud-init.yaml diff --git a/redhat.cfg b/deprecated/redhat.cfg similarity index 99% rename from redhat.cfg rename to deprecated/redhat.cfg index 307fa8f..15b44bd 100644 --- a/redhat.cfg +++ b/deprecated/redhat.cfg @@ -158,7 +158,7 @@ if [ -e /dev/disk/by-label/installer ]; then done cd / - curl -O "$confhome/resize.sh" + curl -O "$confhome/deprecated/resize.sh" echo '@reboot root bash /resize.sh' >/etc/cron.d/resize fi %end diff --git a/resize.sh b/deprecated/resize.sh similarity index 100% rename from resize.sh rename to deprecated/resize.sh diff --git a/ubuntu-storage-early.sh b/deprecated/ubuntu-storage-early.sh similarity index 100% rename from ubuntu-storage-early.sh rename to deprecated/ubuntu-storage-early.sh diff --git a/ubuntu.yaml b/deprecated/ubuntu.yaml similarity index 96% rename from ubuntu.yaml rename to deprecated/ubuntu.yaml index 00bc443..3e821a6 100644 --- a/ubuntu.yaml +++ b/deprecated/ubuntu.yaml @@ -28,7 +28,7 @@ autoinstall: # 生成分区信息 xda=$(curl -L "$confhome/get-xda.sh" | sh -s) export xda - curl -L "$confhome/ubuntu-storage-early.sh" | sh -s + curl -L "$confhome/deprecated/ubuntu-storage-early.sh" | sh -s # 要安装的版本 # 有的镜像只有一个版本，没有 install-sources.yaml @@ -72,7 +72,7 @@ autoinstall: # 下载合并分区脚本 cd /target - curl -LO $confhome/resize.sh + curl -LO $confhome/deprecated/resize.sh # 升级 cloud-init # curtin in-target --target=/target -- apt update diff --git a/reinstall.sh b/reinstall.sh index da2cee1..5b3a221 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -1390,7 +1390,7 @@ Continue? set_osvar iso "$iso" # ks - set_osvar ks "$confhome/ubuntu.yaml" + set_osvar ks "$confhome/deprecated/ubuntu.yaml" set_osvar minimal "$minimal" fi } @@ -1773,7 +1773,7 @@ Continue with DD? set_osvar mirrorlist "$mirrorlist" - set_osvar ks "$confhome/redhat.cfg" + set_osvar ks "$confhome/deprecated/redhat.cfg" set_osvar vmlinuz "${mirror}images/pxeboot/vmlinuz" set_osvar initrd "${mirror}images/pxeboot/initrd.img" set_osvar squashfs "${mirror}images/install.img" diff --git a/trans.sh b/trans.sh index 4cfb9bd..d7712b7 100644 --- a/trans.sh +++ b/trans.sh @@ -3333,7 +3333,7 @@ download_cloud_init_config() { recognize_ipv6_types=$3 ci_file=$os_dir/etc/cloud/cloud.cfg.d/99_fallback.cfg - download $confhome/cloud-init.yaml $ci_file + download $confhome/deprecated/cloud-init.yaml $ci_file # 删除注释行，除了第一行 sed -i '1!{/^[[:space:]]*#/d}' $ci_file @@ -3803,7 +3803,7 @@ modify_linux() { for ethx in $(get_eths); do if is_staticv4 || is_staticv6; then fix_sh=cloud-init-fix-onlink.sh - download "$confhome/$fix_sh" "$os_dir/$fix_sh" + download "$confhome/deprecated/$fix_sh" "$os_dir/$fix_sh" insert_into_file "$ci_file" after '^runcmd:' <