mirror of
https://github.com/bin456789/reinstall.git
synced 2025-12-10 07:28:56 +08:00
Compare commits
2 Commits
f22cda1f10
...
780e1a694f
| Author | SHA1 | Date | |
|---|---|---|---|
| 780e1a694f | |||
| 43ba86076f |
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
20
reinstall.sh
20
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
|
||||
@ -960,8 +960,11 @@ get_windows_iso_link() {
|
||||
esac
|
||||
}
|
||||
|
||||
# 8.1 和 11 arm 没有每月发布 iso
|
||||
# 因此优先从 msdl 下载
|
||||
# msdl 没有每月发布的 iso
|
||||
# msdl 只有 consumer 版本,因此里面的 pro 版本不是 vl 版
|
||||
# 8.1 没有每月发布的 iso,因此优先从 msdl 下载
|
||||
# win10 22h2 arm 有每月发布的 iso,因此不从 msdl 下载
|
||||
# win10/11 ltsc 没有每月发布的 iso,但是 msdl 没有 ltsc 版本
|
||||
get_label_msdl() {
|
||||
case "$version" in
|
||||
8.1)
|
||||
@ -969,15 +972,6 @@ get_windows_iso_link() {
|
||||
'' | pro) echo _ ;;
|
||||
esac
|
||||
;;
|
||||
11)
|
||||
case "$edition" in
|
||||
home | 'home single language' | pro | education | 'pro education' | 'pro for workstations')
|
||||
case "$arch_win" in
|
||||
arm64) echo _ ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
@ -1858,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' \
|
||||
|
||||
13
trans.sh
13
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
|
||||
|
||||
Reference in New Issue
Block a user