mirror of
https://github.com/bin456789/reinstall.git
synced 2026-05-21 05:27:41 +08:00
Compare commits
2 Commits
d95c492596
...
9e71f131db
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e71f131db | |||
| e03ac1cdb3 |
@ -58,7 +58,7 @@ The system requirements for the target system are as follows:
|
||||
| <img width="16" height="16" src="https://www.centos.org/assets/icons/favicon.svg" /> CentOS Stream | 9, 10 | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://fedoraproject.org/favicon.ico" /> Fedora | 43, 44 | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://www.openeuler.org/favicon.ico" /> openEuler | 20.03 LTS - 24.03 LTS | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://static.opensuse.org/favicon.ico" /> openSUSE | Leap 15.6, 16.0, Tumbleweed (Rolling) | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://static.opensuse.org/favicon.ico" /> openSUSE | Leap 16.0, Tumbleweed (Rolling) | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://nixos.org/favicon.svg" /> NixOS | 25.11 | 512 MB | 5 GB |
|
||||
| <img width="16" height="16" src="https://archlinux.org/static/favicon.png" /> Arch | Rolling | 512 MB | 5 GB |
|
||||
| <img width="16" height="16" src="https://www.gentoo.org/assets/img/logo/gentoo-g.png" /> Gentoo | Rolling | 512 MB | 5 GB |
|
||||
@ -165,9 +165,9 @@ bash reinstall.sh anolis 7|8|23
|
||||
nixos 25.11
|
||||
fedora 43|44
|
||||
debian 9|10|11|12|13
|
||||
opensuse 16.0|tumbleweed
|
||||
openeuler 20.03|22.03|24.03
|
||||
alpine 3.20|3.21|3.22|3.23
|
||||
opensuse 15.6|16.0|tumbleweed
|
||||
ubuntu 18.04|20.04|22.04|24.04|26.04 [--minimal]
|
||||
kali
|
||||
arch
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
| <img width="16" height="16" src="https://www.centos.org/assets/icons/favicon.svg" /> CentOS Stream | 9, 10 | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://fedoraproject.org/favicon.ico" /> Fedora | 43, 44 | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://www.openeuler.org/favicon.ico" /> openEuler | 20.03 LTS - 24.03 LTS | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://static.opensuse.org/favicon.ico" /> openSUSE | Leap 15.6, 16.0, Tumbleweed (滚动) | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://static.opensuse.org/favicon.ico" /> openSUSE | Leap 16.0, Tumbleweed (滚动) | 512 MB \* | 5 GB |
|
||||
| <img width="16" height="16" src="https://nixos.org/favicon.svg" /> NixOS | 25.11 | 512 MB | 5 GB |
|
||||
| <img width="16" height="16" src="https://archlinux.org/static/favicon.png" /> Arch | 滚动 | 512 MB | 5 GB |
|
||||
| <img width="16" height="16" src="https://www.gentoo.org/assets/img/logo/gentoo-g.png" /> Gentoo | 滚动 | 512 MB | 5 GB |
|
||||
@ -165,9 +165,9 @@ bash reinstall.sh anolis 7|8|23
|
||||
nixos 25.11
|
||||
fedora 43|44
|
||||
debian 9|10|11|12|13
|
||||
opensuse 16.0|tumbleweed
|
||||
openeuler 20.03|22.03|24.03
|
||||
alpine 3.20|3.21|3.22|3.23
|
||||
opensuse 15.6|16.0|tumbleweed
|
||||
ubuntu 18.04|20.04|22.04|24.04|26.04 [--minimal]
|
||||
kali
|
||||
arch
|
||||
|
||||
@ -170,47 +170,6 @@ GatewayOnLink=yes
|
||||
fi
|
||||
}
|
||||
|
||||
fix_wicked_conf() {
|
||||
# https://github.com/openSUSE/wicked/wiki/FAQ#q-why-wicked-does-not-set-my-default-static-route
|
||||
|
||||
# 修改前
|
||||
# default 1.1.1.1 - -
|
||||
# default 2602::1 - -
|
||||
|
||||
# 修改后
|
||||
# 1.1.1.1 - -
|
||||
# 2602::1 - -
|
||||
# default 1.1.1.1 - -
|
||||
# default 2602::1 - -
|
||||
|
||||
if ! confs=$(ls "$os_dir/etc/sysconfig/network/ifroute-"* 2>/dev/null); then
|
||||
return
|
||||
fi
|
||||
|
||||
for conf in $confs; do
|
||||
# 判断 bug 是否已经修复
|
||||
if grep -v 'default' "$conf" | grep -q '-'; then
|
||||
return
|
||||
fi
|
||||
|
||||
# 获取网关
|
||||
gateways=$(awk '$1=="default" {print $2}' "$conf")
|
||||
if [ -z "$gateways" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
# 创建新条目
|
||||
for gateway in $gateways; do
|
||||
echo "$gateway - -"
|
||||
done | insert_into_file "$conf" head
|
||||
done
|
||||
|
||||
# 重新应用配置
|
||||
if systemctl -q is-enabled wicked; then
|
||||
systemctl restart wicked
|
||||
fi
|
||||
}
|
||||
|
||||
# ubuntu 18.04 cloud-init 版本 23.1.2，因此不用处理
|
||||
|
||||
# debian 10/11 云镜像原本用 ifupdown + resolvconf，脚本改成用 netplan + networkd/resolved
|
||||
@ -224,6 +183,3 @@ fix_netplan_conf
|
||||
# 只需对云镜像处理
|
||||
# 因为普通安装用的是 alpine 的 cloud-init，版本够新，不用处理
|
||||
fix_networkd_conf
|
||||
|
||||
# opensuse 15.5: ifcfg + netconfig (dns) + wicked
|
||||
fix_wicked_conf
|
||||
|
||||
@ -9,10 +9,6 @@ Before=network.service
|
||||
Before=networking.service
|
||||
Before=systemd-networkd.service
|
||||
Before=NetworkManager.service
|
||||
Before=wickedd-auto4.service
|
||||
Before=wickedd-dhcp4.service
|
||||
Before=wickedd-dhcp6.service
|
||||
Before=wickedd.service
|
||||
|
||||
Before=network.target
|
||||
|
||||
|
||||
@ -86,9 +86,9 @@ Usage: $reinstall_____ anolis 7|8|23
|
||||
nixos 25.11
|
||||
fedora 43|44
|
||||
debian 9|10|11|12|13
|
||||
opensuse 16.0|tumbleweed
|
||||
openeuler 20.03|22.03|24.03
|
||||
alpine 3.20|3.21|3.22|3.23
|
||||
opensuse 15.6|16.0|tumbleweed
|
||||
ubuntu 18.04|20.04|22.04|24.04|26.04 [--minimal]
|
||||
kali
|
||||
arch
|
||||
@ -1479,13 +1479,11 @@ Continue?
|
||||
# leap
|
||||
dir=distribution/leap/$releasever/appliances
|
||||
case "$releasever" in
|
||||
15.6) file=openSUSE-Leap-$releasever-Minimal-VM.$basearch-Cloud.qcow2 ;;
|
||||
16.0) file=Leap-$releasever-Minimal-VM.$basearch-Cloud.qcow2 ;;
|
||||
# 16.0) file=Leap-$releasever-Minimal-VM.$basearch-kvm$(if [ "$basearch" = x86_64 ]; then echo '-and-xen'; fi).qcow2 ;;
|
||||
esac
|
||||
|
||||
# https://src.opensuse.org/openSUSE/Leap-Images/src/branch/leap-16.0/kiwi-templates-Minimal/Minimal.kiwi
|
||||
# https://build.opensuse.org/projects/Virtualization:Appliances:Images:openSUSE-Leap-15.6/packages/kiwi-templates-Minimal/files/Minimal.kiwi
|
||||
# https://build.opensuse.org/projects/Virtualization:Appliances:Images:openSUSE-Tumbleweed/packages/kiwi-templates-Minimal/files/Minimal.kiwi
|
||||
# 有专门的kvm镜像，openSUSE-Leap-15.5-Minimal-VM.x86_64-kvm-and-xen.qcow2，里面没有cloud-init
|
||||
# file=openSUSE-Leap-15.5-Minimal-VM.x86_64-kvm-and-xen.qcow2
|
||||
@ -1913,7 +1911,7 @@ verify_os_name() {
|
||||
'fedora 43|44' \
|
||||
'nixos 25.11' \
|
||||
'debian 9|10|11|12|13' \
|
||||
'opensuse 15.6|16.0|tumbleweed' \
|
||||
'opensuse 16.0|tumbleweed' \
|
||||
'alpine 3.20|3.21|3.22|3.23' \
|
||||
'openeuler 20.03|22.03|24.03' \
|
||||
'ubuntu 18.04|20.04|22.04|24.04|26.04' \
|
||||
|
||||
147
trans.sh
147
trans.sh
@ -1783,6 +1783,7 @@ install_nixos() {
|
||||
|
||||
if is_need_set_ssh_keys; then
|
||||
nix_ssh_keys_or_PermitRootLogin="
|
||||
services.openssh.settings.PasswordAuthentication = false;
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
$(del_comment_lines </configs/ssh_keys | del_empty_lines | quote_line | add_space 2)
|
||||
];
|
||||
@ -2029,10 +2030,10 @@ basic_init() {
|
||||
# 公钥/密码
|
||||
if is_need_set_ssh_keys; then
|
||||
set_ssh_keys_and_del_password $os_dir
|
||||
change_ssh_conf_for_root_key_login $os_dir
|
||||
else
|
||||
change_root_password $os_dir
|
||||
allow_root_password_login $os_dir
|
||||
allow_password_login $os_dir
|
||||
change_ssh_conf_for_root_password_login $os_dir
|
||||
fi
|
||||
|
||||
# 下载 fix-eth-name.service
|
||||
@ -3752,61 +3753,11 @@ EOF
|
||||
# 禁用 selinux
|
||||
disable_selinux $os_dir
|
||||
|
||||
# opensuse leap 15.6 用 wicked
|
||||
# opensuse leap 16.0 / tumbleweed 用 NetworkManager
|
||||
if chroot $os_dir rpm -qi wicked; then
|
||||
# sysconfig ifcfg
|
||||
create_cloud_init_network_config $os_dir/net.cfg
|
||||
chroot $os_dir cloud-init devel net-convert \
|
||||
-p /net.cfg -k yaml -d out -D opensuse -O sysconfig
|
||||
|
||||
# 删除
|
||||
# Created by cloud-init on instance boot automatically, do not edit.
|
||||
#
|
||||
sed -i '/^#/d' "$os_dir/out/etc/sysconfig/network/ifcfg-eth"*
|
||||
|
||||
for ethx in $(get_eths); do
|
||||
# 1. 修复甲骨文云重启后 ipv6 丢失
|
||||
# https://github.com/openSUSE/wicked/issues/1058
|
||||
# 还要注意 wicked dhcpv6 获取到的 ipv6 是 /64，其他 DHCPv6 程序获取到的是 /128
|
||||
echo DHCLIENT6_USE_LAST_LEASE=no >>$os_dir/out/etc/sysconfig/network/ifcfg-$ethx
|
||||
|
||||
# 2. 修复 onlink 网关
|
||||
for prefix in '' 'default '; do
|
||||
if is_staticv4; then
|
||||
get_netconf_to ipv4_gateway
|
||||
echo "${prefix}${ipv4_gateway} - -" >>$os_dir/out/etc/sysconfig/network/ifroute-$ethx
|
||||
fi
|
||||
if is_staticv6; then
|
||||
get_netconf_to ipv6_gateway
|
||||
echo "${prefix}${ipv6_gateway} - -" >>$os_dir/out/etc/sysconfig/network/ifroute-$ethx
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
# 复制配置
|
||||
for file in \
|
||||
"$os_dir/out/etc/sysconfig/network/ifcfg-eth"* \
|
||||
"$os_dir/out/etc/sysconfig/network/ifroute-eth"*; do
|
||||
# 动态 ip 没有 ifroute-eth*
|
||||
if [ -f $file ]; then
|
||||
cp $file $os_dir/etc/sysconfig/network/
|
||||
fi
|
||||
done
|
||||
|
||||
# 清理
|
||||
rm -rf $os_dir/net.cfg $os_dir/out
|
||||
|
||||
else
|
||||
# 如果使用 cloud-init 则需要 touch NetworkManager.conf
|
||||
# 更新到 cloud-init 24.1 后删除
|
||||
# touch $os_dir/etc/NetworkManager/NetworkManager.conf
|
||||
|
||||
# 可以直接用 alpine 的 cloud-init 生成 Network Manager 配置
|
||||
create_cloud_init_network_config /net.cfg
|
||||
create_network_manager_config /net.cfg "$os_dir"
|
||||
rm /net.cfg
|
||||
fi
|
||||
|
||||
# 选择新内核
|
||||
# 只有 leap 有 kernel-azure
|
||||
@ -4082,30 +4033,50 @@ set_ssh_keys_and_del_password() {
|
||||
chroot $os_dir passwd -d root
|
||||
}
|
||||
|
||||
# 除了 alpine 都会用到
|
||||
change_ssh_conf() {
|
||||
os_dir=$1
|
||||
key=$2
|
||||
value=$3
|
||||
sub_conf=$4
|
||||
change_ssh_conf_if_different() {
|
||||
local os_dir=$1
|
||||
local key=$2
|
||||
local value=$3
|
||||
local sub_conf=$4
|
||||
if [ -z "$sub_conf" ]; then
|
||||
sub_conf=$(echo "01-$key.conf" | to_lower)
|
||||
fi
|
||||
|
||||
if line="^$key .*" && grep -Exq "$line" $os_dir/etc/ssh/sshd_config 2>/dev/null; then
|
||||
# 如果 sshd_config 存在此 key（非注释状态），则替换
|
||||
# 有些发行版自带了某些配置，例如
|
||||
# ubuntu:
|
||||
# cat /etc/ssh/sshd_config.d/60-cloudimg-settings.conf | grep -i PasswordAuthentication
|
||||
# PasswordAuthentication no
|
||||
|
||||
# gentoo:
|
||||
# cat /etc/ssh/sshd_config.d/9999999gentoo-pam.conf | grep -i PasswordAuthentication
|
||||
# PasswordAuthentication no
|
||||
|
||||
# 0. 如果已经有这个配置，则不修改，避免不必要的改动
|
||||
if chroot "$os_dir" sshd -G | grep -Fxiq "$key $value"; then
|
||||
return
|
||||
fi
|
||||
|
||||
if line="^$key .*" && grep -Exiq "$line" $os_dir/etc/ssh/sshd_config 2>/dev/null; then
|
||||
# 1. 如果 sshd_config 存在此 key（非注释状态），则替换
|
||||
sed -Ei "s/$line/$key $value/" $os_dir/etc/ssh/sshd_config
|
||||
elif include_line='^Include.*/etc/ssh/sshd_config.d' &&
|
||||
elif include_line='^Include .*/etc/ssh/sshd_config.d' &&
|
||||
# 2. 如果 sshd_config 设置了读取 sshd_config.d
|
||||
# 则写入到 sshd_config.d/01-xxx.conf
|
||||
|
||||
# arch 没有 /etc/ssh/sshd_config.d/ 文件夹
|
||||
# opensuse tumbleweed 没有 /etc/ssh/sshd_config
|
||||
# 有 /etc/ssh/sshd_config.d/ 文件夹
|
||||
# 有 /usr/etc/ssh/sshd_config
|
||||
{ grep -q "$include_line" $os_dir/etc/ssh/sshd_config ||
|
||||
grep -q "$include_line" $os_dir/usr/etc/ssh/sshd_config; } 2>/dev/null; then
|
||||
{ grep -iq "$include_line" $os_dir/etc/ssh/sshd_config ||
|
||||
grep -iq "$include_line" $os_dir/usr/etc/ssh/sshd_config; } 2>/dev/null; then
|
||||
mkdir -p $os_dir/etc/ssh/sshd_config.d/
|
||||
echo "$key $value" >"$os_dir/etc/ssh/sshd_config.d/$sub_conf"
|
||||
else
|
||||
# 3. 写入 sshd_config
|
||||
# 如果 sshd_config 存在此 key (无论是否已注释)，则替换，包括删除注释
|
||||
# 否则追加
|
||||
line="^[# ]*$key .*"
|
||||
if grep -Exq "$line" $os_dir/etc/ssh/sshd_config; then
|
||||
if grep -Exiq "$line" $os_dir/etc/ssh/sshd_config; then
|
||||
sed -Ei "s/$line/$key $value/" $os_dir/etc/ssh/sshd_config
|
||||
else
|
||||
echo "$key $value" >>$os_dir/etc/ssh/sshd_config
|
||||
@ -4113,32 +4084,40 @@ change_ssh_conf() {
|
||||
fi
|
||||
}
|
||||
|
||||
allow_password_login() {
|
||||
os_dir=$1
|
||||
change_ssh_conf "$os_dir" PasswordAuthentication yes 01-PasswordAuthentication.conf
|
||||
change_ssh_conf_for_root_key_login() {
|
||||
local os_dir=$1
|
||||
|
||||
# 目前脚本只用 root ，不需要设置这个
|
||||
# change_ssh_conf_if_different "$os_dir" PasswordAuthentication no
|
||||
|
||||
# 这个也不需要设置，默认就是 prohibit-password
|
||||
# change_ssh_conf_if_different "$os_dir" PermitRootLogin prohibit-password
|
||||
}
|
||||
|
||||
allow_root_password_login() {
|
||||
os_dir=$1
|
||||
change_ssh_conf_for_root_password_login() {
|
||||
local os_dir=$1
|
||||
|
||||
# opensuse 16/tumbleweed 安装 openssh-server-config-rootlogin
|
||||
# 会生成 /usr/etc/ssh/sshd_config.d/50-permit-root-login.conf
|
||||
# 但是如果用户删除了此文件，包有更新的话，可能会重新创建这个文件？
|
||||
# 因此先不用这个方法
|
||||
if false && [ -f $os_dir/etc/os-release ] &&
|
||||
grep -iq opensuse $os_dir/etc/os-release &&
|
||||
! grep -iq 15.6 $os_dir/etc/os-release; then
|
||||
if false &&
|
||||
[ -f $os_dir/etc/os-release ] &&
|
||||
grep -iq opensuse $os_dir/etc/os-release; then
|
||||
chroot $os_dir zypper install -y openssh-server-config-rootlogin
|
||||
else
|
||||
change_ssh_conf "$os_dir" PermitRootLogin yes 01-permitrootlogin.conf
|
||||
fi
|
||||
|
||||
# PasswordAuthentication 默认是 yes
|
||||
# 但某些发行版会在 sshd_config.d 里设置 PasswordAuthentication no
|
||||
change_ssh_conf_if_different "$os_dir" PasswordAuthentication yes
|
||||
change_ssh_conf_if_different "$os_dir" PermitRootLogin yes
|
||||
}
|
||||
|
||||
change_ssh_port() {
|
||||
os_dir=$1
|
||||
ssh_port=$2
|
||||
local os_dir=$1
|
||||
local ssh_port=$2
|
||||
|
||||
change_ssh_conf "$os_dir" Port "$ssh_port" 01-change-ssh-port.conf
|
||||
change_ssh_conf_if_different "$os_dir" Port "$ssh_port"
|
||||
}
|
||||
|
||||
change_root_password() {
|
||||
@ -4595,7 +4574,11 @@ install_fnos() {
|
||||
|
||||
# ssh root 登录，测试用
|
||||
if false; then
|
||||
allow_root_password_login $os_dir
|
||||
if is_need_set_ssh_keys; then
|
||||
change_ssh_conf_for_root_key_login $os_dir
|
||||
else
|
||||
change_ssh_conf_for_root_password_login $os_dir
|
||||
fi
|
||||
chroot $os_dir systemctl enable ssh
|
||||
fi
|
||||
|
||||
@ -5035,6 +5018,9 @@ EOF
|
||||
fi
|
||||
|
||||
# 自带的 60-cloudimg-settings.conf 禁止了 PasswordAuthentication
|
||||
# 可删除可不删除，因为现在会先读取有效 sshd 配置再修改 sshd 配置
|
||||
# 如果要删除 60-cloudimg-settings.conf 则要在 change_ssh_conf_if_different 之前删除
|
||||
if false; then
|
||||
file=$os_dir/etc/ssh/sshd_config.d/60-cloudimg-settings.conf
|
||||
if [ -f $file ]; then
|
||||
sed -i '/^PasswordAuthentication/d' $file
|
||||
@ -5042,6 +5028,7 @@ EOF
|
||||
rm -f $file
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# 更改 efi 目录的 grub.cfg 写死的 fsuuid
|
||||
# 因为 24.04 fsuuid 对应 boot 分区
|
||||
@ -7814,7 +7801,7 @@ mount / -o remount,size=100%
|
||||
sync_time || true
|
||||
|
||||
# 安装 ssh 并更改端口
|
||||
apk add openssh
|
||||
apk add openssh-server
|
||||
if is_need_change_ssh_port; then
|
||||
change_ssh_port / $ssh_port
|
||||
fi
|
||||
@ -7822,6 +7809,8 @@ fi
|
||||
# 设置密码，添加开机启动 + 开启 ssh 服务
|
||||
if is_need_set_ssh_keys; then
|
||||
set_ssh_keys_and_del_password /
|
||||
# 目前脚本只用 root，不需要设置这个
|
||||
# change_ssh_conf_if_different / PasswordAuthentication no
|
||||
printf '\n' | setup-sshd
|
||||
else
|
||||
change_root_password /
|
||||
|
||||
Reference in New Issue
Block a user