From 05a476d93243780cd5a8d460d0bdbf78a176db10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E4=BD=B3=E5=B8=86?= <452531855@qq.com> Date: Thu, 10 Sep 2026 16:21:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20provision=20=E5=86=99=E5=85=A5=20NM=20k?= =?UTF-8?q?eep-configuration=3Dno=E2=80=94=E2=80=94=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E5=BC=80=E6=9C=BA=E6=94=B6=E7=BC=96=20initramfs(dracut=20?= =?UTF-8?q?=E9=81=97=E7=95=99=20DHCP)=E6=8A=A2=E9=85=8D=E7=9A=84=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5,=E5=BC=BA=E5=88=B6=E6=8C=89=20autoconnect-priority=20?= =?UTF-8?q?=E9=80=89=E8=B7=AF=E6=BF=80=E6=B4=BB=E9=9D=99=E6=80=81=E6=A1=A3?= =?UTF-8?q?=E6=A1=88;initrd=20=E7=9A=84=20DHCP=20=E7=A7=9F=E7=BA=A6?= =?UTF-8?q?=E4=BB=A5=E5=89=AF=E5=9C=B0=E5=9D=80=E5=85=B1=E5=AD=98(?= =?UTF-8?q?=E5=8F=8C=20IP:=E9=9D=99=E6=80=81=E4=B8=BB+DHCP=20=E5=89=AF?= =?UTF-8?q?=E5=85=9C=E5=BA=95);rollback=20=E5=AF=B9=E7=A7=B0=E7=A7=BB?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/provision-host.sh | 12 ++++++++++++ scripts/rollback-host.sh | 1 + 2 files changed, 13 insertions(+) diff --git a/scripts/provision-host.sh b/scripts/provision-host.sh index a5db062..411b9f9 100644 --- a/scripts/provision-host.sh +++ b/scripts/provision-host.sh @@ -9,6 +9,8 @@ # 4. 禁用 cloud-init 网络管理,netplan renderer 切换为 NetworkManager # 5. rfkill 解锁无线网卡 # 6. 安装 polkit 放行规则(容器内 root 调用 NM/systemd D-Bus) +# 7. 禁止 NM 开机收编 initramfs 抢配的连接(keep-configuration=no), +# 确保开机按 autoconnect-priority 选路,静态档案不被绕过 # # 用法: sudo bash provision-host.sh # 回滚: sudo bash rollback-host.sh @@ -41,6 +43,16 @@ cat > /etc/NetworkManager/conf.d/99-mixingx.conf <<'EOF' no-auto-default=* EOF +# 禁止 NM 开机收编 initramfs 阶段(dracut 遗留 DHCP 配置)抢配的现状: +# 默认 keep-configuration 走 connection-assumed,autoconnect-priority 选路不执行, +# 静态档案开机被绕过(表现为"重启后静态 IP 变回 DHCP")。 +# 设为 no 后 NM 开机总是按最高 autoconnect-priority 激活持久档案; +# initrd 抢到的 DHCP 租约会以副地址共存(双 IP:静态主 + DHCP 副兜底)。 +cat > /etc/NetworkManager/conf.d/98-keep-configuration.conf <<'EOF' +[device] +keep-configuration=no +EOF + systemctl enable --now NetworkManager >/dev/null 2>&1 || true # ── 2. 识别主网口并读取当前参数 ─────────────────────────────────────────── diff --git a/scripts/rollback-host.sh b/scripts/rollback-host.sh index 680d639..5b8dfd8 100644 --- a/scripts/rollback-host.sh +++ b/scripts/rollback-host.sh @@ -42,6 +42,7 @@ systemctl disable --now NetworkManager >/dev/null 2>&1 || true # ── 4. 移除 polkit 规则 / NM 覆盖配置 ───────────────────────────────────── rm -f /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla rm -f /etc/NetworkManager/conf.d/99-mixingx.conf +rm -f /etc/NetworkManager/conf.d/98-keep-configuration.conf sleep 3 ip -4 addr show | awk '/inet /{print " " $2 " @ " $NF}'