From 24b6e7f922b216c078aac65f0912a1e1a1bb39d1 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Thu, 6 Feb 2025 18:47:21 +0800 Subject: [PATCH] =?UTF-8?q?gentoo:=20=E4=BF=AE=E6=94=B9=E4=BA=91=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reinstall.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/reinstall.sh b/reinstall.sh index 72bb1f9..9b5359e 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -1293,20 +1293,21 @@ Continue? mirror=https://distfiles.gentoo.org # cdn77 fi - if is_use_cloud_image; then - if [ "$basearch_alt" = arm64 ]; then - error_and_exit 'Not support arm64 for gentoo cloud image.' - fi + dir=releases/$basearch_alt/autobuilds - # openrc 镜像没有附带兼容 cloud-init 的网络管理器 - eval ${step}_img=$mirror/experimental/$basearch_alt/openstack/gentoo-openstack-$basearch_alt-systemd-latest.qcow2 + if is_use_cloud_image; then + # 使用 systemd 且没有 cloud-init + prefix=di-$basearch_alt-console + filename=$(curl -L $mirror/$dir/latest-$prefix.txt | grep '.qcow2' | awk '{print $1}' | grep .) + file=$mirror/$dir/$filename + test_url "$file" 'qemu' + eval ${step}_img=$file else prefix=stage3-$basearch_alt-systemd - dir=releases/$basearch_alt/autobuilds - file=$(curl -L $mirror/$dir/latest-$prefix.txt | grep '.tar.xz' | awk '{print $1}') - stage3=$mirror/$dir/$file - test_url $stage3 'tar.xz' - eval ${step}_img=$stage3 + filename=$(curl -L $mirror/$dir/latest-$prefix.txt | grep '.tar.xz' | awk '{print $1}' | grep .) + file=$mirror/$dir/$filename + test_url "$file" 'tar.xz' + eval ${step}_img=$file fi }