From 49642219d27e7e7c285cdb8f9dfb2bfb50f6e344 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Thu, 18 Jan 2024 23:52:54 +0800 Subject: [PATCH] =?UTF-8?q?opensuse:=20tumbleweed=20=E4=BA=91=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=8E=B0=E5=B7=B2=E5=AE=89=E8=A3=85=20NetworkManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 +- README.md | 2 +- reinstall.sh | 4 ++-- trans.sh | 8 +++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.en.md b/README.en.md index 0880823..1c29608 100644 --- a/README.en.md +++ b/README.en.md @@ -47,7 +47,7 @@ bash reinstall.sh centos 7|8|9 (8|9 for stream versions) debian 10|11|12 ubuntu 20.04|22.04 alpine 3.16|3.17|3.18|3.19 - opensuse 15.4|15.5|tumbleweed (supports cloud mirror only) + opensuse 15.5|tumbleweed (supports cloud mirror only) arch (supports only amd64 cloud mirror) gentoo (supports only amd64 cloud mirror) diff --git a/README.md b/README.md index 3676df8..0f41c4b 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ bash reinstall.sh centos 7|8|9 (8|9 为 stream 版本) debian 10|11|12 ubuntu 20.04|22.04 alpine 3.16|3.17|3.18|3.19 - opensuse 15.4|15.5|tumbleweed (只支持云镜像) + opensuse 15.5|tumbleweed (只支持云镜像) arch (只支持 amd64 云镜像) gentoo (只支持 amd64 云镜像) diff --git a/reinstall.sh b/reinstall.sh index 5e2921a..fdd2e83 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -25,7 +25,7 @@ Usage: reinstall.sh centos 7|8|9 debian 10|11|12 ubuntu 20.04|22.04 alpine 3.16|3.17|3.18|3.19 - opensuse 15.4|15.5|tumbleweed + opensuse 15.5|tumbleweed arch gentoo dd --img=http://xxx @@ -619,7 +619,7 @@ verify_os_name() { 'debian 10|11|12' \ 'ubuntu 20.04|22.04' \ 'alpine 3.16|3.17|3.18|3.19' \ - 'opensuse 15.4|15.5|tumbleweed' \ + 'opensuse 15.5|tumbleweed' \ 'arch' \ 'gentoo' \ 'windows' \ diff --git a/trans.sh b/trans.sh index 1d1e117..aa9e1ac 100644 --- a/trans.sh +++ b/trans.sh @@ -1289,12 +1289,10 @@ EOF fi fi - # opensuse tumbleweed 需安装 wicked + # opensuse tumbleweed + # TODO: cloud-init 更新后删除 if grep opensuse-tumbleweed $os_dir/etc/os-release; then - cp -f /etc/resolv.conf $os_dir/etc/resolv.conf - mount_pseudo_fs $os_dir - chroot $os_dir zypper install -y wicked - rm -f $os_dir/etc/resolv.conf + touch $os_dir/etc/NetworkManager/NetworkManager.conf fi # arch