feat(fnos-mount-manager): 添加 remount 命令功能

新增 remount 命令用于将被 FNOS 挂载到错误路径的磁盘重新挂回正确的业务名路径，
同时修复了 apply 命令中 tmpfiles 配置文件安装逻辑，并添加了完整的测试用例。

Author: mudssky

linux/fnos/fnos-mount-manager/README.md

@@ -44,6 +44,9 @@ bash linux/fnos/fnos-mount-manager/fnos-mount-manager.sh apply --target /tmp/fst
 
 # 执行统一修复
 bash linux/fnos/fnos-mount-manager/fnos-mount-manager.sh repair
+
+# 把被 FNOS 挂到型号路径的磁盘重新挂回业务名路径
+bash linux/fnos/fnos-mount-manager/fnos-mount-manager.sh remount
 ```
 
 ## 迁移说明

linux/fnos/fnos-mount-manager/build.sh

@@ -18,6 +18,7 @@ MODULES=(
   "${SOURCE_DIR}/commands/check.sh"
   "${SOURCE_DIR}/commands/status.sh"
   "${SOURCE_DIR}/commands/repair.sh"
+  "${SOURCE_DIR}/commands/remount.sh"
   "${SOURCE_DIR}/main.sh"
 )
 

linux/fnos/fnos-mount-manager/commands/remount.sh

@@ -0,0 +1,98 @@
+# shellcheck shell=bash
+
+if [[ -n "${FNOS_MOUNT_MANAGER_REMOUNT_LOADED:-}" ]]; then
+  return 0
+fi
+FNOS_MOUNT_MANAGER_REMOUNT_LOADED=1
+
+# 以更主动的方式把磁盘重新挂到受管挂载点：
+# 若设备已经被挂到错误路径，会先卸载错误目标，再按我们的挂载点重挂。
+fm_remount_disk() {
+  local index="$1"
+  local name="${FM_CONFIG_DISK_NAMES[${index}]}"
+  local source="${FM_CONFIG_DISK_SOURCES[${index}]}"
+  local mountpoint="${FM_CONFIG_DISK_MOUNTPOINTS[${index}]}"
+  local device_path
+  device_path="$(fm_source_to_device_path "${source}")"
+
+  local mounted_target=""
+  mounted_target="$(fm_find_mount_target_for_device "${device_path}")"
+
+  if [[ "${mounted_target}" == "${mountpoint}" ]]; then
+    fm_log "info" "${name} already mounted at ${mountpoint}"
+    return 0
+  fi
+
+  fm_run_privileged mkdir -p "${mountpoint}"
+
+  if [[ -n "${mounted_target}" ]]; then
+    fm_log "warn" "${name} device is mounted at ${mounted_target}; remounting to ${mountpoint}"
+
+    if ! fm_run_privileged umount "${mounted_target}" >/dev/null 2>&1; then
+      # FNOS 相关服务可能仍持有旧路径句柄，显式 remount 时退到 lazy umount。
+      fm_run_privileged umount -l "${mounted_target}" >/dev/null 2>&1 || true
+    fi
+
+    mounted_target="$(fm_find_mount_target_for_device "${device_path}")"
+    if [[ -n "${mounted_target}" ]]; then
+      fm_log "warn" "${name} device is still mounted at ${mounted_target}"
+      return 1
+    fi
+  fi
+
+  if command -v systemctl >/dev/null 2>&1; then
+    local mount_unit
+    mount_unit="$(fm_unit_name_for_path "${mountpoint}" mount)"
+    fm_run_privileged systemctl reset-failed "${mount_unit}" >/dev/null 2>&1 || true
+    fm_run_privileged systemctl stop "${mount_unit}" >/dev/null 2>&1 || true
+
+    local automount_unit
+    automount_unit="$(fm_unit_name_for_path "${mountpoint}" automount)"
+    fm_run_privileged systemctl reset-failed "${automount_unit}" >/dev/null 2>&1 || true
+    fm_run_privileged systemctl stop "${automount_unit}" >/dev/null 2>&1 || true
+  fi
+
+  if fm_run_privileged mount "${mountpoint}" >/dev/null 2>&1; then
+    fm_log "info" "Remounted ${name} to ${mountpoint}"
+    return 0
+  fi
+
+  fm_log "warn" "Remount failed for ${name}"
+  return 1
+}
+
+# 显式接管错误挂载并切回受管命名。
+fm_cmd_remount() {
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --help | -h)
+        cat <<'EOF'
+Usage: fnos-mount-manager remount
+
+Force managed disks back onto the configured mountpoints.
+EOF
+        return 0
+        ;;
+      *)
+        fm_die "Unknown remount option: $1"
+        ;;
+    esac
+  done
+
+  [[ -f "$(fm_local_config_path)" ]] || fm_die "Local config not found: $(fm_local_config_path)"
+  fm_load_config "$(fm_local_config_path)"
+
+  local failures=0
+  local i
+  for (( i = 0; i < ${#FM_CONFIG_DISK_NAMES[@]}; i += 1 )); do
+    if ! fm_remount_disk "${i}"; then
+      failures=$(( failures + 1 ))
+    fi
+  done
+
+  if (( failures > 0 )); then
+    fm_die "Remount completed with ${failures} failure(s)"
+  fi
+
+  fm_log "info" "Remount completed successfully"
+}

linux/fnos/fnos-mount-manager/fnos-mount-manager.sh

@@ -642,6 +642,7 @@ fm_prepare_mountpoints() {
 fm_cmd_apply() {
   local target="/etc/fstab"
   local tmpfiles_target="/etc/tmpfiles.d/fnos-mount-manager.conf"
+  local install_tmpfiles="0"
 
   while [[ $# -gt 0 ]]; do
     case "$1" in
@@ -651,6 +652,7 @@ fm_cmd_apply() {
         ;;
       --tmpfiles-target)
         tmpfiles_target="$2"
+        install_tmpfiles="1"
         shift 2
         ;;
       --help | -h)
@@ -682,13 +684,14 @@ EOF
 
   if [[ "${target}" == "/etc/fstab" ]]; then
     fm_prepare_mountpoints
+    install_tmpfiles="1"
   fi
 
   fm_install_file "${temp_output}" "${target}"
   rm -f "${temp_output}"
   fm_log "info" "Applied managed block to ${target}"
 
-  if [[ "${target}" == "/etc/fstab" ]]; then
+  if [[ "${install_tmpfiles}" == "1" ]]; then
     fm_install_file "$(fm_local_tmpfiles_path)" "${tmpfiles_target}"
     fm_log "info" "Applied tmpfiles rules to ${tmpfiles_target}"
   fi
@@ -762,16 +765,18 @@ fm_check_rendered_file() {
   fi
 
   local temp_render
+  local temp_tmpfiles
   temp_render="$(mktemp)"
+  temp_tmpfiles="$(mktemp)"
 
-  fm_generate_scope "${config_path}" "${temp_render}" "${source_label}"
+  fm_generate_scope "${config_path}" "${temp_render}" "${temp_tmpfiles}" "${source_label}"
 
   if ! cmp -s "${rendered_path}" "${temp_render}"; then
     fm_log "error" "Rendered file is stale: ${rendered_path}"
     error_count_ref=$(( error_count_ref + 1 ))
   fi
 
-  rm -f "${temp_render}"
+  rm -f "${temp_render}" "${temp_tmpfiles}"
 }
 
 # 检查已知的 shell 登录补挂载片段，避免把副作用留在非显式命令路径里。
@@ -1086,6 +1091,107 @@ EOF
 }
 
 
+# --- remount.sh ---
+# shellcheck shell=bash
+
+if [[ -n "${FNOS_MOUNT_MANAGER_REMOUNT_LOADED:-}" ]]; then
+  return 0
+fi
+FNOS_MOUNT_MANAGER_REMOUNT_LOADED=1
+
+# 以更主动的方式把磁盘重新挂到受管挂载点：
+# 若设备已经被挂到错误路径，会先卸载错误目标，再按我们的挂载点重挂。
+fm_remount_disk() {
+  local index="$1"
+  local name="${FM_CONFIG_DISK_NAMES[${index}]}"
+  local source="${FM_CONFIG_DISK_SOURCES[${index}]}"
+  local mountpoint="${FM_CONFIG_DISK_MOUNTPOINTS[${index}]}"
+  local device_path
+  device_path="$(fm_source_to_device_path "${source}")"
+
+  local mounted_target=""
+  mounted_target="$(fm_find_mount_target_for_device "${device_path}")"
+
+  if [[ "${mounted_target}" == "${mountpoint}" ]]; then
+    fm_log "info" "${name} already mounted at ${mountpoint}"
+    return 0
+  fi
+
+  fm_run_privileged mkdir -p "${mountpoint}"
+
+  if [[ -n "${mounted_target}" ]]; then
+    fm_log "warn" "${name} device is mounted at ${mounted_target}; remounting to ${mountpoint}"
+
+    if ! fm_run_privileged umount "${mounted_target}" >/dev/null 2>&1; then
+      # FNOS 相关服务可能仍持有旧路径句柄，显式 remount 时退到 lazy umount。
+      fm_run_privileged umount -l "${mounted_target}" >/dev/null 2>&1 || true
+    fi
+
+    mounted_target="$(fm_find_mount_target_for_device "${device_path}")"
+    if [[ -n "${mounted_target}" ]]; then
+      fm_log "warn" "${name} device is still mounted at ${mounted_target}"
+      return 1
+    fi
+  fi
+
+  if command -v systemctl >/dev/null 2>&1; then
+    local mount_unit
+    mount_unit="$(fm_unit_name_for_path "${mountpoint}" mount)"
+    fm_run_privileged systemctl reset-failed "${mount_unit}" >/dev/null 2>&1 || true
+    fm_run_privileged systemctl stop "${mount_unit}" >/dev/null 2>&1 || true
+
+    local automount_unit
+    automount_unit="$(fm_unit_name_for_path "${mountpoint}" automount)"
+    fm_run_privileged systemctl reset-failed "${automount_unit}" >/dev/null 2>&1 || true
+    fm_run_privileged systemctl stop "${automount_unit}" >/dev/null 2>&1 || true
+  fi
+
+  if fm_run_privileged mount "${mountpoint}" >/dev/null 2>&1; then
+    fm_log "info" "Remounted ${name} to ${mountpoint}"
+    return 0
+  fi
+
+  fm_log "warn" "Remount failed for ${name}"
+  return 1
+}
+
+# 显式接管错误挂载并切回受管命名。
+fm_cmd_remount() {
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --help | -h)
+        cat <<'EOF'
+Usage: fnos-mount-manager remount
+
+Force managed disks back onto the configured mountpoints.
+EOF
+        return 0
+        ;;
+      *)
+        fm_die "Unknown remount option: $1"
+        ;;
+    esac
+  done
+
+  [[ -f "$(fm_local_config_path)" ]] || fm_die "Local config not found: $(fm_local_config_path)"
+  fm_load_config "$(fm_local_config_path)"
+
+  local failures=0
+  local i
+  for (( i = 0; i < ${#FM_CONFIG_DISK_NAMES[@]}; i += 1 )); do
+    if ! fm_remount_disk "${i}"; then
+      failures=$(( failures + 1 ))
+    fi
+  done
+
+  if (( failures > 0 )); then
+    fm_die "Remount completed with ${failures} failure(s)"
+  fi
+
+  fm_log "info" "Remount completed successfully"
+}
+
+
 # --- main.sh ---
 #!/usr/bin/env bash
 set -Eeuo pipefail
@@ -1107,6 +1213,8 @@ if [[ -z "${FNOS_MANAGER_STANDALONE:-}" ]]; then
   source "${SCRIPT_DIR}/commands/status.sh"
   # shellcheck source=linux/fnos/fnos-mount-manager/commands/repair.sh
   source "${SCRIPT_DIR}/commands/repair.sh"
+  # shellcheck source=linux/fnos/fnos-mount-manager/commands/remount.sh
+  source "${SCRIPT_DIR}/commands/remount.sh"
 fi
 
 # 输出统一帮助信息，说明配置路径和常用命令。
@@ -1120,6 +1228,7 @@ Commands:
   check       Validate config drift and known conflicts
   status      Show current disk and unit status
   repair      Attempt a unified mount repair
+  remount     Move disks back onto the managed mountpoints
   help        Show this help
 EOF
 }
@@ -1147,6 +1256,9 @@ fm_main() {
     repair)
       fm_cmd_repair "$@"
       ;;
+    remount)
+      fm_cmd_remount "$@"
+      ;;
     help | --help | -h)
       fm_show_help
       ;;

linux/fnos/fnos-mount-manager/main.sh

@@ -18,6 +18,8 @@ if [[ -z "${FNOS_MANAGER_STANDALONE:-}" ]]; then
   source "${SCRIPT_DIR}/commands/status.sh"
   # shellcheck source=linux/fnos/fnos-mount-manager/commands/repair.sh
   source "${SCRIPT_DIR}/commands/repair.sh"
+  # shellcheck source=linux/fnos/fnos-mount-manager/commands/remount.sh
+  source "${SCRIPT_DIR}/commands/remount.sh"
 fi
 
 # 输出统一帮助信息，说明配置路径和常用命令。
@@ -31,6 +33,7 @@ Commands:
   check       Validate config drift and known conflicts
   status      Show current disk and unit status
   repair      Attempt a unified mount repair
+  remount     Move disks back onto the managed mountpoints
   help        Show this help
 EOF
 }
@@ -58,6 +61,9 @@ fm_main() {
     repair)
       fm_cmd_repair "$@"
       ;;
+    remount)
+      fm_cmd_remount "$@"
+      ;;
     help | --help | -h)
       fm_show_help
       ;;