From 0156afbbe7d6bad9e6f30ed62809cc18dc2eb132 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Thu, 30 Apr 2026 22:08:15 +0800 Subject: [PATCH] =?UTF-8?q?fedora:=20=E5=AE=89=E8=A3=85=E6=97=B6=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20mount=20-a=20=E6=8C=82=E8=BD=BD=E5=88=86=E5=8C=BA?= =?UTF-8?q?=E5=92=8C=E5=AD=90=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fedora: 添加 44 --- README.en.md | 10 +++++----- README.md | 10 +++++----- reinstall.sh | 8 ++++---- trans.sh | 11 ++++++++--- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/README.en.md b/README.en.md index 97b690f..98d3a1b 100644 --- a/README.en.md +++ b/README.en.md @@ -56,8 +56,8 @@ The system requirements for the target system are as follows: | RHEL   AlmaLinux   Rocky   Oracle | 8, 9, 10 | 512 MB \* | 5 GB | | OpenCloudOS | 8, 9, Stream 23 | 512 MB \* | 5 GB | | CentOS Stream | 9, 10 | 512 MB \* | 5 GB | -| Fedora | 42, 43 | 512 MB \* | 5 GB | -| openEuler | 20.03 LTS - 24.03 LTS, 25.09 | 512 MB \* | 5 GB | +| Fedora | 43, 44 | 512 MB \* | 5 GB | +| openEuler | 20.03 LTS - 24.03 LTS | 512 MB \* | 5 GB | | openSUSE | Leap 15.6, 16.0, Tumbleweed (Rolling) | 512 MB \* | 5 GB | | NixOS | 25.11 | 512 MB | 5 GB | | Arch | Rolling | 512 MB | 5 GB | @@ -149,7 +149,7 @@ certutil -urlcache -f -split https://cnb.cool/bin456789/reinstall/-/git/raw/main - Username `root`. The script prompts for a password. If left blank, a random one is generated. - When installing the latest version, the version number does not need to be specified. -- Maximizes disk space usage: no boot partition (except for Fedora) and no swap partition. +- Maximizes disk space utilization: no boot or swap partitions. - Automatically selects different optimized kernels based on machine type, such as `Cloud` or `HWE` kernels. - When installing Red Hat, you must provide the `qcow2` image link obtained from . You can also install `qcow2` of other RHEL-based OS, such as `Alibaba Cloud Linux` and `TencentOS Server`. - After reinstallation, if you need to change the SSH port or switch to key-based login, make sure to also modify the files inside `/etc/ssh/sshd_config.d/`. @@ -163,11 +163,11 @@ bash reinstall.sh anolis 7|8|23 centos 9|10 fnos 1 nixos 25.11 - fedora 42|43 + fedora 43|44 debian 9|10|11|12|13 + openeuler 20.03|22.03|24.03 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 18.04|20.04|22.04|24.04|26.04 [--minimal] kali arch diff --git a/README.md b/README.md index 8a06018..3295807 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ | RHEL   AlmaLinux   Rocky   Oracle | 8, 9, 10 | 512 MB \* | 5 GB | | OpenCloudOS | 8, 9, Stream 23 | 512 MB \* | 5 GB | | CentOS Stream | 9, 10 | 512 MB \* | 5 GB | -| Fedora | 42, 43 | 512 MB \* | 5 GB | -| openEuler | 20.03 LTS - 24.03 LTS, 25.09 | 512 MB \* | 5 GB | +| Fedora | 43, 44 | 512 MB \* | 5 GB | +| openEuler | 20.03 LTS - 24.03 LTS | 512 MB \* | 5 GB | | openSUSE | Leap 15.6, 16.0, Tumbleweed (滚动) | 512 MB \* | 5 GB | | NixOS | 25.11 | 512 MB | 5 GB | | Arch | 滚动 | 512 MB | 5 GB | @@ -149,7 +149,7 @@ certutil -urlcache -f -split https://cnb.cool/bin456789/reinstall/-/git/raw/main - 用户名为 `root`，脚本会提示输入密码，不输入则使用随机密码 - 安装最新版可不输入版本号 -- 最大化利用磁盘空间：不含 boot 分区（Fedora 例外），不含 swap 分区 +- 最大化利用磁盘空间：不含 boot 和 swap 分区 - 自动根据机器类型选择不同的优化内核，例如 `Cloud`、`HWE` 内核 - 安装 Red Hat 时需填写 得到的 `qcow2` 镜像链接，也可以安装其它类 RHEL 系统的 `qcow2`，例如 `Alibaba Cloud Linux` 和 `TencentOS Server` - 重装后如需修改 SSH 端口或者改成密钥登录，注意还要修改 `/etc/ssh/sshd_config.d/` 里面的文件 @@ -163,11 +163,11 @@ bash reinstall.sh anolis 7|8|23 centos 9|10 fnos 1 nixos 25.11 - fedora 42|43 + fedora 43|44 debian 9|10|11|12|13 + openeuler 20.03|22.03|24.03 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 18.04|20.04|22.04|24.04|26.04 [--minimal] kali arch diff --git a/reinstall.sh b/reinstall.sh index 6c500f4..e9d87e1 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -84,11 +84,11 @@ Usage: $reinstall_____ anolis 7|8|23 centos 9|10 fnos 1 nixos 25.11 - fedora 42|43 + fedora 43|44 debian 9|10|11|12|13 + openeuler 20.03|22.03|24.03 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 18.04|20.04|22.04|24.04|26.04 [--minimal] kali arch @@ -1910,12 +1910,12 @@ verify_os_name() { 'rocky 8|9|10' \ 'oracle 8|9|10' \ 'fnos 1' \ - 'fedora 42|43' \ + 'fedora 43|44' \ 'nixos 25.11' \ 'debian 9|10|11|12|13' \ 'opensuse 15.6|16.0|tumbleweed' \ 'alpine 3.20|3.21|3.22|3.23' \ - 'openeuler 20.03|22.03|24.03|25.09' \ + 'openeuler 20.03|22.03|24.03' \ 'ubuntu 18.04|20.04|22.04|24.04|26.04' \ 'redhat' \ 'kali' \ diff --git a/trans.sh b/trans.sh index 44912d8..6ac3f16 100644 --- a/trans.sh +++ b/trans.sh @@ -3481,8 +3481,9 @@ modify_linux() { find_and_mount() { mount_point=$1 mount_dev=$(awk "\$2==\"$mount_point\" {print \$1}" $os_dir/etc/fstab) + mount_opts=$(awk "\$2==\"$mount_point\" {print \$4}" $os_dir/etc/fstab) if [ -n "$mount_dev" ]; then - mount $mount_dev $os_dir$mount_point + mount -o "$mount_opts" "$mount_dev" "$os_dir$mount_point" fi } @@ -3510,9 +3511,13 @@ EOF # 防止删除 cloud-init / 安装 firmware 时不够内存 create_swap_if_ram_less_than 2048 $os_dir/swapfile - find_and_mount /boot - find_and_mount /boot/efi mount_pseudo_fs $os_dir + + # find_and_mount /boot + # find_and_mount /boot/efi + # fedora 的 fstab 还有 /home /var，因此用 mount -a + chroot $os_dir mount -a + cp_resolv_conf $os_dir # 可以直接用 alpine 的 cloud-init 生成 Network Manager 配置