summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-11-21 01:48:36 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-11-21 01:48:36 +0100
commit58852c67b5185930b7a82480c46eb25f7416048c (patch)
treef3b3b99160ef69d4529f4103302a7dccc342ecef
parent8054860ca329653c6d9271092ac8525e22b3cd6b (diff)
downloadtdelibs-58852c67b5185930b7a82480c46eb25f7416048c.tar.gz
tdelibs-58852c67b5185930b7a82480c46eb25f7416048c.zip
Disable unallowed options for udisks/udisks2 in tdehw storage backend
-rw-r--r--tdecore/tdehw/tdestoragedevice.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index 4ea8bfde8..2dd812a79 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -626,7 +626,8 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption
if( (mountOptions["filesystem"] == "jfs")) {
if (mountOptions["utf8"] == "true") {
- optionString.append(",iocharset=utf8");
+ // udisks/udisks2 for now does not support option iocharset= for jfs
+ // optionString.append(",iocharset=utf8");
}
}
@@ -640,7 +641,8 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption
|| (mountOptions["filesystem"] == "ext4")
) {
if (mountOptions.contains("journaling")) {
- optionString.append(TQString(",data=%1").arg(mountOptions["journaling"]));
+ // udisks/udisks2 for now does not support option data= for ext3/ext4
+ // optionString.append(TQString(",data=%1").arg(mountOptions["journaling"]));
}
}