diff --git a/scripts/provision-host.sh b/scripts/provision-host.sh index c621df3..a5db062 100644 --- a/scripts/provision-host.sh +++ b/scripts/provision-host.sh @@ -46,36 +46,28 @@ 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 "未找到默认路由网卡(主机当前无网络?)" +PRIMARY_TYPE=$(ip link show "$PRIMARY_IF" | grep -o 'link/[a-z]*' | head -1) 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:-<无>}" +CUR_DNS4=$(grep -h '^nameserver' /run/systemd/resolve/resolv.conf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf 2>/dev/null \ + | awk '{print $2}' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -u | tr '\n' ' ') +log "主网口 $PRIMARY_IF 当前: 地址=$CUR_ADDR 网关=$CUR_GW DNS4=${CUR_DNS4:-<无>}" -# ── 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 +# ── 3. 救援连接(仅以太网主口;WiFi 主口跳过——救援 DHCP 对 WiFi 无意义) ──── +if [[ "$PRIMARY_TYPE" == "ethernet"* ]]; then + 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 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 ───────────────────────────── +# ── 4. 全局切换 netplan renderer → NetworkManager ──────────────────────── +# 不删除原 netplan 配置(ethernet/wifi 定义、SSID/PSK 原样保留), +# netplan 会把原有连接定义自动渲染为等值的 NM profiles,无缝接管 if [[ ! -f /etc/netplan/90-mixingx-nm.yaml ]]; then log "备份原 netplan 配置 → $BACKUP_DIR/netplan/" mkdir -p "$BACKUP_DIR/netplan" @@ -85,8 +77,7 @@ if [[ ! -f /etc/netplan/90-mixingx-nm.yaml ]]; then 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 + log "写入全局 renderer=NetworkManager" cat > /etc/netplan/90-mixingx-nm.yaml <<'EOF' network: version: 2