From b58e09952efd6d4d9528d94a676ec0c94a8dfa37 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Fri, 30 May 2025 23:53:16 +0800 Subject: [PATCH] =?UTF-8?q?alpine:=20=E6=B7=BB=E5=8A=A0=203.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 4 ++-- README.md | 4 ++-- reinstall.sh | 4 ++-- trans.sh | 23 +++++++++++++++-------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/README.en.md b/README.en.md index 9fa2401..95539df 100644 --- a/README.en.md +++ b/README.en.md @@ -31,7 +31,7 @@ The system requirements for the target system are as follows: | System | Version | Memory | Disk | | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ---------------- | -| Alpine | 3.18, 3.19, 3.20, 3.21 | 256 MB | 1 GB | +| Alpine | 3.19, 3.20, 3.21, 3.22 | 256 MB | 1 GB | | Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 GB ^ | | Kali | Rolling | 256 MB | 1 ~ 1.5 GB ^ | | Ubuntu | 16.04 LTS - 24.04 LTS, 25.04 | 512 MB \* | 2 GB | @@ -135,7 +135,7 @@ bash reinstall.sh anolis 7|8|23 nixos 25.05 debian 9|10|11|12 opensuse 15.6|tumbleweed - alpine 3.18|3.19|3.20|3.21 + alpine 3.19|3.20|3.21|3.22 openeuler 20.03|22.03|24.03|25.03 ubuntu 16.04|18.04|20.04|22.04|24.04|25.04 [--minimal] kali diff --git a/README.md b/README.md index 452a943..9758d70 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ | 系统 | 版本 | 内存 | 硬盘 | | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ------------ | -| Alpine | 3.18, 3.19, 3.20, 3.21 | 256 MB | 1 GB | +| Alpine | 3.19, 3.20, 3.21, 3.22 | 256 MB | 1 GB | | Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 GB ^ | | Kali | 滚动 | 256 MB | 1 ~ 1.5 GB ^ | | Ubuntu | 16.04 LTS - 24.04 LTS, 25.04 | 512 MB \* | 2 GB | @@ -135,7 +135,7 @@ bash reinstall.sh anolis 7|8|23 nixos 25.05 debian 9|10|11|12 opensuse 15.6|tumbleweed - alpine 3.18|3.19|3.20|3.21 + alpine 3.19|3.20|3.21|3.22 openeuler 20.03|22.03|24.03|25.03 ubuntu 16.04|18.04|20.04|22.04|24.04|25.04 [--minimal] kali diff --git a/reinstall.sh b/reinstall.sh index c37e5c2..fd22700 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -55,7 +55,7 @@ Usage: $reinstall_____ anolis 7|8|23 nixos 25.05 debian 9|10|11|12 opensuse 15.6|tumbleweed - alpine 3.18|3.19|3.20|3.21 + alpine 3.19|3.20|3.21|3.22 openeuler 20.03|22.03|24.03|25.03 ubuntu 16.04|18.04|20.04|22.04|24.04|25.04 [--minimal] kali @@ -1830,7 +1830,7 @@ verify_os_name() { 'nixos 25.05' \ 'debian 9|10|11|12' \ 'opensuse 15.6|16.0|tumbleweed' \ - 'alpine 3.18|3.19|3.20|3.21' \ + 'alpine 3.19|3.20|3.21|3.22' \ 'openeuler 20.03|22.03|24.03|25.03' \ 'ubuntu 16.04|18.04|20.04|22.04|24.04|25.04' \ 'redhat' \ diff --git a/trans.sh b/trans.sh index 15b450b..fce2207 100644 --- a/trans.sh +++ b/trans.sh @@ -1403,6 +1403,18 @@ install_alpine() { # 删除 setup-disk 时自动安装的包 apk del e2fsprogs dosfstools efibootmgr grub* + # 如果没有挂载 /proc + + # 1. chroot /os setup-keymap us us 会报错 + # grep: /proc/filesystems: No such file or directory + + # 2. 安装固件微码会触发 grub-probe，如果没挂载会报错 + # Executing grub-2.12-r5.trigger + # /usr/sbin/grub-probe: error: failed to get canonical path of `/dev/vda1'. + # ERROR: grub-2.12-r5.trigger: script exited with error 1 + + mount_pseudo_fs /os + # 安装到硬盘后才安装各种应用 # 避免占用 Live OS 内存 @@ -1432,7 +1444,9 @@ install_alpine() { # 安装其他部件 chroot /os setup-keymap us us chroot /os setup-timezone -i Asia/Shanghai - chroot /os setup-ntp chrony || true + # 3.21 默认是 chrony + # 3.22 默认是 busybox ntp + printf '\n' | chroot /os setup-ntp || true # 设置公钥 if is_need_set_ssh_keys; then @@ -1454,13 +1468,6 @@ install_alpine() { cp /configs/frpc.toml /os/etc/frp/frpc.toml fi - # 安装固件微码会触发 grub-probe - # 如果没挂载会报错 - # Executing grub-2.12-r5.trigger - # /usr/sbin/grub-probe: error: failed to get canonical path of `/dev/vda1'. - # ERROR: grub-2.12-r5.trigger: script exited with error 1 - mount_pseudo_fs /os - # setup-disk 会自动选择固件，但不包括微码？ # https://github.com/alpinelinux/alpine-conf/blob/3.18.1/setup-disk.in#L421 if fw_pkgs="$fw_pkgs $(get_ucode_firmware_pkgs)" && [ -n "$fw_pkgs" ]; then