From 61edf871168d4085e14a0cb5ccbc2a1805b15f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E4=BD=B3=E5=B8=86?= <452531855@qq.com> Date: Fri, 4 Sep 2026 14:56:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(scripts):=20network-agent=20=E4=B8=BB?= =?UTF-8?q?=E6=9C=BA=E5=88=9D=E5=A7=8B=E5=8C=96=E8=84=9A=E6=9C=AC=E2=80=94?= =?UTF-8?q?=E2=80=94=E8=A3=85=20NM=20=E5=B9=B6=E7=AD=89=E5=80=BC=E9=9D=99?= =?UTF-8?q?=E6=80=81=E8=BF=9E=E6=8E=A5=E5=88=87=E6=8D=A2=20netplan=20rende?= =?UTF-8?q?rer(=E4=B8=8D=E6=96=AD=E7=BD=91),rescue-dhcp=20=E4=BD=8E?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E5=85=9C=E5=BA=95,rfkill=20?= =?UTF-8?q?=E8=A7=A3=E9=94=81=E6=97=A0=E7=BA=BF=E4=B8=8E=20polkit=20?= =?UTF-8?q?=E6=94=BE=E8=A1=8C,=E9=99=84=20rollback=20=E5=8F=8D=E5=90=91?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/provision-host.sh | 121 ++++++++++++++++++++++++++++++++++++++ scripts/rollback-host.sh | 48 +++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 scripts/provision-host.sh create mode 100644 scripts/rollback-host.sh diff --git a/scripts/provision-host.sh b/scripts/provision-host.sh new file mode 100644 index 0000000..c621df3 --- /dev/null +++ b/scripts/provision-host.sh @@ -0,0 +1,121 @@ +#!/usr/bin/env bash +# ============================================================================ +# provision-host.sh — MixingX network-agent 主机初始化 (Ubuntu Server 20.04+) +# +# 职责(幂等,可重复执行): +# 1. 安装并启动 NetworkManager(服务器版默认未装) +# 2. 读取主网口当前网络参数,预创建等值静态 NM 连接(切换前后地址不变,不断网) +# 3. 创建低优先级 DHCP 救援连接(静态配错时的主机侧兜底) +# 4. 禁用 cloud-init 网络管理,netplan renderer 切换为 NetworkManager +# 5. rfkill 解锁无线网卡 +# 6. 安装 polkit 放行规则(容器内 root 调用 NM/systemd D-Bus) +# +# 用法: sudo bash provision-host.sh +# 回滚: sudo bash rollback-host.sh +# 备份: /var/backups/mixingx-netconsole/ +# ============================================================================ +set -euo pipefail + +BACKUP_DIR=/var/backups/mixingx-netconsole + +log() { echo -e "\033[32m[mixingx]\033[0m $*"; } +die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; } + +[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0" +command -v ip >/dev/null 2>&1 || die "缺少 ip 命令" + +mkdir -p "$BACKUP_DIR" + +# ── 1. 安装 NetworkManager ──────────────────────────────────────────────── +if ! command -v nmcli >/dev/null 2>&1; then + log "安装 NetworkManager ..." + export DEBIAN_FRONTEND=noninteractive + apt-get update -qq + apt-get install -y -qq network-manager +fi + +# 关闭 NM 自动建连(未配置网卡自动 DHCP),避免与现有 networkd 抢接口 +mkdir -p /etc/NetworkManager/conf.d +cat > /etc/NetworkManager/conf.d/99-mixingx.conf <<'EOF' +[main] +no-auto-default=* +EOF + +systemctl enable --now NetworkManager >/dev/null 2>&1 || true + +# ── 2. 识别主网口并读取当前参数 ─────────────────────────────────────────── +PRIMARY_IF=$(ip -4 route show default | awk '{print $5; exit}') +[[ -n "${PRIMARY_IF:-}" ]] || die "未找到默认路由网卡(主机当前无网络?)" + +CUR_ADDR=$(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2; exit}') # x.x.x.x/前缀 +CUR_GW=$(ip -4 route show default | awk '{print $3; exit}') +CUR_DNS=$(grep -h '^nameserver' /run/systemd/resolve/resolv.conf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf 2>/dev/null \ + | awk '{print $2}' | grep -v '^127\.' | sort -u | tr '\n' ' ') +log "主网口 $PRIMARY_IF 当前: 地址=$CUR_ADDR 网关=$CUR_GW DNS=${CUR_DNS:-<无>}" + +# ── 3. 预创建 NM 连接 ───────────────────────────────────────────────────── +# 3.1 主连接:等值当前参数的静态地址(切换 renderer 后地址不变) +if ! nmcli -g NAME,DEVICE connection show 2>/dev/null | grep -q ":${PRIMARY_IF}$"; then + log "创建主 NM 连接 mixingx-$PRIMARY_IF (静态,等值当前参数)" + nmcli connection add type ethernet ifname "$PRIMARY_IF" con-name "mixingx-$PRIMARY_IF" \ + ipv4.method manual \ + ipv4.addresses "$CUR_ADDR" \ + ipv4.gateway "$CUR_GW" \ + ${CUR_DNS:+ipv4.dns "${CUR_DNS// /,}"} \ + connection.autoconnect yes \ + connection.autoconnect-priority 0 >/dev/null +fi + +# 3.2 救援连接:优先级最低,主连接起不来时 DHCP 自动接管(网页配错 IP 的保命通道) +if ! nmcli connection show "rescue-dhcp" >/dev/null 2>&1; then + log "创建救援 DHCP 连接 rescue-dhcp (autoconnect-priority -100)" + nmcli connection add type ethernet ifname "$PRIMARY_IF" con-name "rescue-dhcp" \ + ipv4.method auto \ + connection.autoconnect yes \ + connection.autoconnect-priority -100 >/dev/null +fi + +# ── 4. netplan renderer 切换 → NetworkManager ───────────────────────────── +if [[ ! -f /etc/netplan/90-mixingx-nm.yaml ]]; then + log "备份原 netplan 配置 → $BACKUP_DIR/netplan/" + mkdir -p "$BACKUP_DIR/netplan" + cp -a /etc/netplan/*.yaml "$BACKUP_DIR/netplan/" 2>/dev/null || true + + log "禁用 cloud-init 网络管理" + mkdir -p /etc/cloud/cloud.cfg.d + echo "network: {config: disabled}" > /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + + log "切换 netplan renderer → NetworkManager" + rm -f /etc/netplan/50-cloud-init.yaml /etc/netplan/01-netcfg.yaml /etc/netplan/99-installer-config.yaml + cat > /etc/netplan/90-mixingx-nm.yaml <<'EOF' +network: + version: 2 + renderer: NetworkManager +EOF + chmod 600 /etc/netplan/90-mixingx-nm.yaml +fi + +log "应用 netplan (交给 NetworkManager 托管)..." +netplan apply + +# ── 5. 无线解锁 + polkit 放行 ───────────────────────────────────────────── +rfkill unblock all 2>/dev/null || true + +if command -v pkexec >/dev/null 2>&1 || dpkg -s policykit-1 >/dev/null 2>&1; then + mkdir -p /etc/polkit-1/localauthority/50-local.d + cat > /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla <<'EOF' +[MixingX Network Agent] +Identity=unix-user:root +Action=org.freedesktop.NetworkManager.*;org.freedesktop.systemd1.* +ResultAny=yes +ResultInactive=yes +ResultActive=yes +EOF +fi + +# ── 6. 校验 ─────────────────────────────────────────────────────────────── +sleep 3 +log "当前设备状态:" +nmcli -g DEVICE,TYPE,STATE,CONNECTION device status +log "主网口地址: $(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2}')" +log "完成。后续用 k3s 弹窗或 nmcli 管理;回滚执行 rollback-host.sh" diff --git a/scripts/rollback-host.sh b/scripts/rollback-host.sh new file mode 100644 index 0000000..680d639 --- /dev/null +++ b/scripts/rollback-host.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash +# ============================================================================ +# rollback-host.sh — provision-host.sh 的反向操作 +# +# 职责: +# 1. 恢复原 netplan 配置(从 /var/backups/mixingx-netconsole/netplan/) +# 2. 恢复 cloud-init 网络管理 +# 3. 停用 NetworkManager 托管(服务禁用,连接配置保留) +# 4. 移除 polkit 放行规则 +# +# 用法: sudo bash rollback-host.sh +# ============================================================================ +set -euo pipefail + +BACKUP_DIR=/var/backups/mixingx-netconsole + +log() { echo -e "\033[32m[mixingx]\033[0m $*"; } +die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; } + +[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0" + +# ── 1. 恢复 netplan ─────────────────────────────────────────────────────── +if [[ -d "$BACKUP_DIR/netplan" ]] && ls "$BACKUP_DIR/netplan"/*.yaml >/dev/null 2>&1; then + log "恢复备份的 netplan 配置" + rm -f /etc/netplan/90-mixingx-nm.yaml + cp -a "$BACKUP_DIR/netplan"/*.yaml /etc/netplan/ +else + log "无备份,仅移除 NM renderer 配置(回退到 renderer 默认)" + rm -f /etc/netplan/90-mixingx-nm.yaml +fi + +# ── 2. 恢复 cloud-init 网络管理 ─────────────────────────────────────────── +rm -f /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + +log "应用恢复的 netplan ..." +netplan apply + +# ── 3. 停用 NetworkManager ──────────────────────────────────────────────── +log "停用并禁用 NetworkManager" +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 + +sleep 3 +ip -4 addr show | awk '/inet /{print " " $2 " @ " $NF}' +log "回滚完成。NM 连接配置保留在 /etc/NetworkManager/system-connections/ (可手工清理)"