From 0151f8494ab3296a30bca9ea52f60c146db85ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 23 Jan 2016 04:41:59 +0100 Subject: [PATCH] Fix using of custom mountpoints with pmount in tdehwlib This partially resolves Bug 2576 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit c10124c96557042d5a9c0170dd2883557997be3e) --- tdecore/tdehw/tdestoragedevice.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index d08ad178d..d0f7549fa 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -953,10 +953,21 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption optionString.append(TQString(" -c %1").arg(mountOptions["locale"])); } + TQString mountpoint; + if (mountOptions.contains("mountpoint") + && !mountOptions["mountpoint"].isEmpty() + && (mountOptions["mountpoint"] != "/media/")) { + mountpoint = mountOptions["mountpoint"]; + mountpoint.replace("'", "'\\''"); + } + else { + mountpoint = mediaName; + } + TQString passFileName = passwordFile.name(); passFileName.replace("'", "'\\''"); - command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mediaName); + command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mountpoint); } }