Fixed mounting and unmounting of mapped storage devices.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 23 insertions, 16 deletions

diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index 862e7b10e..ef22ca239 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -69,6 +69,26 @@ TDEStorageDevice::~TDEStorageDevice() {
 #endif
 }
 
+TQString TDEStorageDevice::mappedName() {
+	return m_mappedName;
+}
+
+void TDEStorageDevice::updateMappedName() {
+	// Get the device mapped name if present
+	m_mappedName = TQString::null;
+	TQString dmnodename = systemPath();
+	dmnodename.append("/dm/name");
+	TQFile dmnamefile(dmnodename);
+	if (dmnamefile.open(IO_ReadOnly)) {
+		TQTextStream stream(&dmnamefile);
+		m_mappedName = stream.readLine();
+		dmnamefile.close();
+	}
+	if (!m_mappedName.isEmpty()) {
+		m_mappedName.prepend("/dev/mapper/");
+	}
+}
+
 TDEDiskDeviceType::TDEDiskDeviceType TDEStorageDevice::diskType() {
 	return m_diskType;
 }
@@ -266,8 +286,8 @@ TQString TDEStorageDevice::cryptKeySlotFriendlyName(TDELUKSKeySlotStatus::TDELUK
 	}
 }
 
-void TDEStorageDevice::internalSetDeviceNode(TQString sn) {
-	TDEGenericDevice::internalSetDeviceNode(sn);
+void TDEStorageDevice::internalSetDeviceNode(TQString dn) {
+	TDEGenericDevice::internalSetDeviceNode(dn);
 	internalInitializeLUKSIfNeeded();
 }
 
@@ -659,19 +679,6 @@ TQString TDEStorageDevice::mountPath() {
 	// First, ensure that all device information (mainly holders/slaves) is accurate
 	TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 
-	TQString dmnodename = systemPath();
-	dmnodename.append("/dm/name");
-	TQFile namefile( dmnodename );
-	TQString dmaltname;
-	if ( namefile.open( IO_ReadOnly ) ) {
-		TQTextStream stream( &namefile );
-		dmaltname = stream.readLine();
-		namefile.close();
-	}
-	if (!dmaltname.isNull()) {
-		dmaltname.prepend("/dev/mapper/");
-	}
-
 	TQStringList lines;
 	TQFile file( "/proc/mounts" );
 	if ( file.open( IO_ReadOnly ) ) {
@@ -682,7 +689,7 @@ TQString TDEStorageDevice::mountPath() {
 			TQStringList mountInfo = TQStringList::split(" ", line, true);
 			TQString testNode = *mountInfo.at(0);
 			// Check for match
-			if ((testNode == deviceNode()) || (testNode == dmaltname) || (testNode == ("/dev/disk/by-uuid/" + diskUUID()))) {
+			if ((testNode == deviceNode()) || (testNode == mappedName()) || (testNode == ("/dev/disk/by-uuid/" + diskUUID()))) {
 				TQString ret = *mountInfo.at(1);
 				ret.replace("\\040", " ");
 				return ret;