From 775fc4782de958da0d1b1f36e8b61a24ad93ecf7 Mon Sep 17 00:00:00 2001 From: guonafu Date: Fri, 13 Jan 2023 09:45:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=AC=E6=9C=BA=E7=A1=AC=E7=9B=98?= =?UTF-8?q?=E7=9A=84=E5=88=86=E5=8C=BA=E6=8C=82=E8=BD=BD=E7=82=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E7=A9=BA=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=B0=86?= =?UTF-8?q?=E6=8C=82=E8=BD=BD=E7=82=B9=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: nvme磁盘的分区名称构造错误，导致识别挂载信息有误 Log: nvme设备特殊处理 --- application/partedproxy/dmdbushandler.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/application/partedproxy/dmdbushandler.cpp b/application/partedproxy/dmdbushandler.cpp index c352efdd..904dad9b 100644 --- a/application/partedproxy/dmdbushandler.cpp +++ b/application/partedproxy/dmdbushandler.cpp @@ -222,7 +222,15 @@ DeviceInfoMap &DMDbusHandler::probDeviceInfo() if (!mounts.isEmpty()) { for (auto &disk : m_deviceMap) { for (auto &partition : disk.m_partition) { - if (!mounts.contains(QString("%1%2").arg(partition.m_devicePath).arg(partition.m_partitionNumber))) { + QString partitionName = partition.m_name; + if (partitionName.isEmpty()) { + if (partitionName.contains("nvme")) { + partitionName = QString("%1p%2").arg(partition.m_devicePath).arg(partition.m_partitionNumber); + } else { + partitionName = QString("%1%2").arg(partition.m_devicePath).arg(partition.m_partitionNumber); + } + } + if (!mounts.contains(partitionName)) { partition.m_mountPoints.clear(); } }