diff --git a/README.en.md b/README.en.md index 2720924..e1c16c8 100644 --- a/README.en.md +++ b/README.en.md @@ -159,7 +159,7 @@ bash reinstall.sh anolis 7|8|23 almalinux 8|9|10 opencloudos 8|9|23 centos 9|10 - fedora 41|42 + fedora 42|43 nixos 25.05 debian 9|10|11|12|13 alpine 3.19|3.20|3.21|3.22 diff --git a/README.md b/README.md index 80e37d1..975be82 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ bash reinstall.sh anolis 7|8|23 almalinux 8|9|10 opencloudos 8|9|23 centos 9|10 - fedora 41|42 + fedora 42|43 nixos 25.05 debian 9|10|11|12|13 alpine 3.19|3.20|3.21|3.22 diff --git a/reinstall.sh b/reinstall.sh index d0d15dd..0f0777c 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -51,7 +51,7 @@ Usage: $reinstall_____ anolis 7|8|23 oracle 8|9|10 almalinux 8|9|10 centos 9|10 - fedora 41|42 + fedora 42|43 nixos 25.05 debian 9|10|11|12|13 alpine 3.19|3.20|3.21|3.22 @@ -1852,7 +1852,7 @@ verify_os_name() { 'almalinux 8|9|10' \ 'rocky 8|9|10' \ 'oracle 8|9|10' \ - 'fedora 41|42' \ + 'fedora 42|43' \ 'nixos 25.05' \ 'debian 9|10|11|12|13' \ 'opensuse 15.6|16.0|tumbleweed' \ diff --git a/trans.sh b/trans.sh index 7f3f8ec..be28f03 100644 --- a/trans.sh +++ b/trans.sh @@ -3364,6 +3364,19 @@ EOF create_network_manager_config /net.cfg "$os_dir" rm /net.cfg + # TODO: fedora 43 eol 后删除 + # 删除 cloud-init 会删除依赖包 netcat + # 但是删除 netcat 时会报错 + # 因此保留 netcat 包 + # >>> Running %preun scriptlet: netcat-0:1.229-3.fc43.x86_64 + # >>> Error in %preun scriptlet: netcat-0:1.229-3.fc43.x86_64 + # >>> Scriptlet output: + # >>> failed to create admindir: No such file or directory + # >>> [RPM] %preun(netcat-1.229-3.fc43.x86_64) scriptlet failed, exit status 2 + # >>> [RPM] netcat-1.229-3.fc43.x86_64: erase failed + if [ "$distro" = fedora ] && [ "$releasever" = 43 ]; then + chroot $os_dir dnf mark user netcat -y + fi remove_cloud_init $os_dir disable_selinux $os_dir