From 58852c67b5185930b7a82480c46eb25f7416048c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 21 Nov 2013 01:48:36 +0100 Subject: [PATCH] Disable unallowed options for udisks/udisks2 in tdehw storage backend --- tdecore/tdehw/tdestoragedevice.cpp | 6 ++++-- 1 file 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"])); } }