From 3a447b02a15ee40fdeb55d24615766266c68fafa Mon Sep 17 00:00:00 2001 From: CityFun <31820853+zhengkunwang223@users.noreply.github.com> Date: Wed, 10 Sep 2025 13:50:51 +0800 Subject: [PATCH] feat: Adjust hard drive mounting logic (#10326) --- agent/app/dto/request/disk.go | 3 ++- agent/app/service/disk.go | 10 ++++++---- frontend/src/lang/modules/zh.ts | 2 +- .../src/views/host/disk-management/partition/index.vue | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/agent/app/dto/request/disk.go b/agent/app/dto/request/disk.go index 4728cc0c0..3fb7cceea 100644 --- a/agent/app/dto/request/disk.go +++ b/agent/app/dto/request/disk.go @@ -5,13 +5,14 @@ type DiskPartitionRequest struct { Filesystem string `json:"filesystem" validate:"required,oneof=ext4 xfs"` Label string `json:"label"` AutoMount bool `json:"autoMount"` - MountPoint string `json:"mountPoint"` + MountPoint string `json:"mountPoint" validate:"required"` } type DiskMountRequest struct { Device string `json:"device" validate:"required"` MountPoint string `json:"mountPoint" validate:"required"` Filesystem string `json:"filesystem" validate:"required,oneof=ext4 xfs"` + AutoMount bool `json:"autoMount"` } type DiskUnmountRequest struct { diff --git a/agent/app/service/disk.go b/agent/app/service/disk.go index 7a75479f0..20c3bcb56 100644 --- a/agent/app/service/disk.go +++ b/agent/app/service/disk.go @@ -81,11 +81,12 @@ func (s *DiskService) PartitionDisk(req request.DiskPartitionRequest) (string, e return "", buserr.WithErr("FormatDiskErr", err) } - if req.AutoMount && req.MountPoint != "" { + if req.MountPoint != "" { mountReq := request.DiskMountRequest{ Device: partition, MountPoint: req.MountPoint, Filesystem: req.Filesystem, + AutoMount: req.AutoMount, } if err := s.MountDisk(mountReq); err != nil { return "", buserr.WithErr("MountDiskErr", err) @@ -122,9 +123,10 @@ func (s *DiskService) MountDisk(req request.DiskMountRequest) error { if err := cmdMgr.RunBashC(fmt.Sprintf("mount -t %s %s %s", req.Filesystem, req.Device, req.MountPoint)); err != nil { return buserr.WithErr("MountDiskErr", err) } - - if err := addToFstabWithOptions(req.Device, req.MountPoint, req.Filesystem, ""); err != nil { - return buserr.WithErr("MountDiskErr", err) + if req.AutoMount { + if err := addToFstabWithOptions(req.Device, req.MountPoint, req.Filesystem, ""); err != nil { + return buserr.WithErr("MountDiskErr", err) + } } return nil diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index d2c800902..1dab5828e 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -2737,7 +2737,7 @@ const message = { unmounted: '未挂载', cannotOperate: '无法操作', systemDiskHelper: '提示:当前磁盘为系统盘，无法进行操作', - autoMount: '自动挂载', + autoMount: '开机自动挂载', model: '设备型号', diskType: '磁盘类型', serial: '序列号', diff --git a/frontend/src/views/host/disk-management/partition/index.vue b/frontend/src/views/host/disk-management/partition/index.vue index bccbe5274..2849f5ed3 100644 --- a/frontend/src/views/host/disk-management/partition/index.vue +++ b/frontend/src/views/host/disk-management/partition/index.vue @@ -27,9 +27,6 @@ - - - + + +