From c82d6838c588aad4e9895cc89b4c15e281008704 Mon Sep 17 00:00:00 2001 From: CityFun <31820853+zhengkunwang223@users.noreply.github.com> Date: Fri, 7 Nov 2025 18:06:31 +0800 Subject: [PATCH] feat: Optimize system disk detection logic (#10889) Refs https://github.com/1Panel-dev/1Panel/issues/10888 --- agent/app/service/disk_utils.go | 2 +- core/i18n/lang/en.yaml | 1 + core/i18n/lang/es-ES.yaml | 1 + core/i18n/lang/ja.yaml | 1 + core/i18n/lang/ko.yaml | 1 + core/i18n/lang/ms.yml | 1 + core/i18n/lang/pt-BR.yaml | 1 + core/i18n/lang/ru.yaml | 1 + core/i18n/lang/tr.yaml | 1 + core/i18n/lang/zh-Hant.yaml | 1 + core/i18n/lang/zh.yaml | 1 + 11 files changed, 11 insertions(+), 1 deletion(-) diff --git a/agent/app/service/disk_utils.go b/agent/app/service/disk_utils.go index c43b95c12..44e4f6ebe 100644 --- a/agent/app/service/disk_utils.go +++ b/agent/app/service/disk_utils.go @@ -394,7 +394,7 @@ func isSystemDisk(mountPoint string) bool { "/boot/efi", "/usr", "/var", - "/home", + "/etc", } for _, sysMount := range systemMountPoints { diff --git a/core/i18n/lang/en.yaml b/core/i18n/lang/en.yaml index d8f0e62be..ebf786366 100644 --- a/core/i18n/lang/en.yaml +++ b/core/i18n/lang/en.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "The group is in use and cannot be deleted." ErrLocalDelete: "Cannot delete the local node!" ErrPortInUsed: "The {{ .name }} port is already in use!" ErrInternalServerKey: "Internal server error:" +MasterNode: "Master Node" # app CustomAppStoreFileValid: "Application store package requires .tar.gz format" diff --git a/core/i18n/lang/es-ES.yaml b/core/i18n/lang/es-ES.yaml index c6f6a3b70..efce69f02 100644 --- a/core/i18n/lang/es-ES.yaml +++ b/core/i18n/lang/es-ES.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "El grupo está en uso y no se puede eliminar." ErrLocalDelete: "¡No se puede eliminar el nodo local!" ErrPortInUsed: "¡El puerto {{ .name }} ya está en uso!" ErrInternalServerKey: "Error interno del servidor:" +MasterNode: "Nodo Maestro" # app CustomAppStoreFileValid: "El paquete de la tienda de aplicaciones debe tener formato .tar.gz" diff --git a/core/i18n/lang/ja.yaml b/core/i18n/lang/ja.yaml index 01991ee98..a120817ea 100644 --- a/core/i18n/lang/ja.yaml +++ b/core/i18n/lang/ja.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "グループは使用中のため、削除できません。" ErrLocalDelete: "ローカルノードは削除できません!" ErrPortInUsed: "{{ .name }} ポートはすでに使用されています!" ErrInternalServerKey: "サーバー内部エラー: " +MasterNode: "マスターノード" # app CustomAppStoreFileValid: "アプリストアパッケージは .tar.gz 形式である必要があります" diff --git a/core/i18n/lang/ko.yaml b/core/i18n/lang/ko.yaml index 67cbb87d7..22149304a 100644 --- a/core/i18n/lang/ko.yaml +++ b/core/i18n/lang/ko.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "그룹이 사용 중이므로 삭제할 수 없습니다." ErrLocalDelete: "로컬 노드는 삭제할 수 없습니다!" ErrPortInUsed: "{{ .name }} 포트가 이미 사용 중입니다!" ErrInternalServerKey: "서버 내부 오류:" +MasterNode: "마스터 노드" # app CustomAppStoreFileValid: "앱 스토어 패키지는 .tar.gz 형식이어야 합니다" diff --git a/core/i18n/lang/ms.yml b/core/i18n/lang/ms.yml index 56ae240e4..ff83d57ed 100644 --- a/core/i18n/lang/ms.yml +++ b/core/i18n/lang/ms.yml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "Kumpulan sedang digunakan dan tidak boleh dipadam." ErrLocalDelete: "Nod tempatan tidak boleh dihapuskan!" ErrPortInUsed: "Port {{ .name }} telah digunakan!" ErrInternalServerKey: "Ralat dalaman pelayan:" +MasterNode: "Nod Induk" # app CustomAppStoreFileValid: "Pakej stor aplikasi perlu dalam format .tar.gz" diff --git a/core/i18n/lang/pt-BR.yaml b/core/i18n/lang/pt-BR.yaml index 8fcf47b14..c40f3daee 100644 --- a/core/i18n/lang/pt-BR.yaml +++ b/core/i18n/lang/pt-BR.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "O grupo está em uso e não pode ser excluído." ErrLocalDelete: "O nó local não pode ser excluído!" ErrPortInUsed: "A porta {{ .name }} já está em uso!" ErrInternalServerKey: "Erro interno do servidor:" +MasterNode: "Nó Mestre" # app CustomAppStoreFileValid: "O pacote da loja de aplicativos deve estar no formato .tar.gz" diff --git a/core/i18n/lang/ru.yaml b/core/i18n/lang/ru.yaml index a929cf09a..084aec387 100644 --- a/core/i18n/lang/ru.yaml +++ b/core/i18n/lang/ru.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "Группа используется и не может бы ErrLocalDelete: "Локальный узел нельзя удалить!" ErrPortInUsed: "Порт {{ .name }} уже используется!" ErrInternalServerKey: "Внутренняя ошибка сервера:" +MasterNode: "Главный узел" # app CustomAppStoreFileValid: "Пакет магазина приложений должен быть в формате .tar.gz" diff --git a/core/i18n/lang/tr.yaml b/core/i18n/lang/tr.yaml index c6b311f39..7b220cc7a 100644 --- a/core/i18n/lang/tr.yaml +++ b/core/i18n/lang/tr.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "Grup kullanımda ve silinemez." ErrLocalDelete: "Yerel düğüm silinemez!" ErrPortInUsed: "{{ .name }} portu zaten kullanımda!" ErrInternalServerKey: "İç sunucu hatası:" +MasterNode: "Ana Düğüm" # app CustomAppStoreFileValid: "Uygulama mağazası paketi .tar.gz formatında olmalıdır" diff --git a/core/i18n/lang/zh-Hant.yaml b/core/i18n/lang/zh-Hant.yaml index 191d60240..18834f545 100644 --- a/core/i18n/lang/zh-Hant.yaml +++ b/core/i18n/lang/zh-Hant.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "分組正被使用,無法刪除。" ErrLocalDelete: "無法刪除本機節點!" ErrPortInUsed: "{{ .name }} 埠已被佔用!" ErrInternalServerKey: "服務內部錯誤: " +MasterNode: "主節點" #app CustomAppStoreFileValid: "應用商店包需要 .tar.gz 格式" diff --git a/core/i18n/lang/zh.yaml b/core/i18n/lang/zh.yaml index da97ba7ba..46ec18d9c 100644 --- a/core/i18n/lang/zh.yaml +++ b/core/i18n/lang/zh.yaml @@ -32,6 +32,7 @@ ErrGroupIsInUse: "分组正被使用,无法删除" ErrLocalDelete: "无法删除本地节点!" ErrPortInUsed: "{{ .name }} 端口已被占用!" ErrInternalServerKey: "服务内部错误:" +MasterNode: "主节点" #app CustomAppStoreFileValid: "应用商店包需要 .tar.gz 格式"