diff --git a/README.en.md b/README.en.md
index 89d982d..a21519a 100644
--- a/README.en.md
+++ b/README.en.md
@@ -58,7 +58,7 @@ The system requirements for the target system are as follows:
| 
CentOS Stream | 9, 10 | 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 |
+| openSUSE | Leap 16.0, Tumbleweed (Rolling) | 512 MB \* | 5 GB |
| 
NixOS | 25.11 | 512 MB | 5 GB |
| 
Arch | Rolling | 512 MB | 5 GB |
| 
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
diff --git a/README.md b/README.md
index 0325708..e1ab9c8 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@
| CentOS Stream | 9, 10 | 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 |
+| openSUSE | Leap 16.0, Tumbleweed (滚动) | 512 MB \* | 5 GB |
| NixOS | 25.11 | 512 MB | 5 GB |
| Arch | 滚动 | 512 MB | 5 GB |
| 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
diff --git a/cloud-init-fix-onlink.sh b/cloud-init-fix-onlink.sh
index 6376618..10e7fd2 100644
--- a/cloud-init-fix-onlink.sh
+++ b/cloud-init-fix-onlink.sh
@@ -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
diff --git a/fix-eth-name.service b/fix-eth-name.service
index 39a4cbd..265daf0 100644
--- a/fix-eth-name.service
+++ b/fix-eth-name.service
@@ -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
diff --git a/reinstall.sh b/reinstall.sh
index eba8071..0731f8f 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -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' \
diff --git a/trans.sh b/trans.sh
index c85a96d..991ba99 100644
--- a/trans.sh
+++ b/trans.sh
@@ -3753,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
+ # 可以直接用 alpine 的 cloud-init 生成 Network Manager 配置
+ create_cloud_init_network_config /net.cfg
+ create_network_manager_config /net.cfg "$os_dir"
+ rm /net.cfg
# 选择新内核
# 只有 leap 有 kernel-azure
@@ -4140,8 +4090,8 @@ change_ssh_conf_for_root_key_login() {
# 目前脚本只用 root ，不需要设置这个
# change_ssh_conf_if_different "$os_dir" PasswordAuthentication no
- # opensuse 15.6 云镜像 /etc/ssh/sshd_config 默认配置了 PermitRootLogin yes
- change_ssh_conf_if_different "$os_dir" PermitRootLogin prohibit-password
+ # 这个也不需要设置，默认就是 prohibit-password
+ # change_ssh_conf_if_different "$os_dir" PermitRootLogin prohibit-password
}
change_ssh_conf_for_root_password_login() {