Fix patch.
This commit is contained in:
parent
a533937225
commit
44934497a7
|
@ -1,6 +1,6 @@
|
||||||
diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
|
diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
|
||||||
--- kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp 2008-10-30 14:24:05.000000000 +0100
|
--- kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp 2008-10-30 14:24:05.000000000 +0100
|
||||||
+++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2008-12-08 02:07:20.000000000 +0100
|
+++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2008-12-08 02:31:43.000000000 +0100
|
||||||
@@ -17,10 +17,13 @@
|
@@ -17,10 +17,13 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@ -37,7 +37,14 @@ diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1
|
||||||
m_teardownInProgress = false;
|
m_teardownInProgress = false;
|
||||||
emit teardownDone(Solid::UnauthorizedOperation,
|
emit teardownDone(Solid::UnauthorizedOperation,
|
||||||
error.name()+": "+error.message(),
|
error.name()+": "+error.message(),
|
||||||
@@ -241,7 +254,8 @@
|
@@ -235,17 +248,18 @@
|
||||||
|
"Mount");
|
||||||
|
QStringList options;
|
||||||
|
QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
|
||||||
|
+ QString fstype=m_device->property("volume.fstype").toString();
|
||||||
|
|
||||||
|
#ifdef Q_OS_FREEBSD
|
||||||
|
QString uid="-u=";
|
||||||
#else
|
#else
|
||||||
QString uid="uid=";
|
QString uid="uid=";
|
||||||
#endif
|
#endif
|
||||||
|
@ -47,6 +54,10 @@ diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1
|
||||||
options << uid+QString::number(::getuid());
|
options << uid+QString::number(::getuid());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- QString fstype=m_device->property("volume.fstype").toString();
|
||||||
|
#ifdef Q_OS_FREEBSD
|
||||||
|
char *cType;
|
||||||
|
if ( fstype=="vfat" && halOptions.contains("-L=")) {
|
||||||
@@ -297,6 +311,59 @@
|
@@ -297,6 +311,59 @@
|
||||||
SLOT(slotDBusError(const QDBusError &)));
|
SLOT(slotDBusError(const QDBusError &)));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue