summaryrefslogtreecommitdiffstats
path: root/opensuse/tdebase/media-cryptosupport.diff
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
committerRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
commit21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch)
tree2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/tdebase/media-cryptosupport.diff
parent8667643bff14a60d8571c599efd3e48bed3e3b12 (diff)
downloadtde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz
tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/tdebase/media-cryptosupport.diff')
-rw-r--r--opensuse/tdebase/media-cryptosupport.diff31
1 files changed, 0 insertions, 31 deletions
diff --git a/opensuse/tdebase/media-cryptosupport.diff b/opensuse/tdebase/media-cryptosupport.diff
deleted file mode 100644
index e9b4fb58d..000000000
--- a/opensuse/tdebase/media-cryptosupport.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: kioslave/media/mediamanager/halbackend.cpp
-===================================================================
---- kioslave/media/mediamanager/halbackend.cpp.orig
-+++ kioslave/media/mediamanager/halbackend.cpp
-@@ -214,10 +214,26 @@ void HALBackend::AddDevice(const char *u
- {
- /* We only list volume that have a filesystem or volume that have an audio track*/
- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" &&
-+ libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "crypto" &&
- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) &&
- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
- return;
-
-+ /* For crypto_LUKS devices check its dm-device, if it is already mounted*/
-+ if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fstype") == "crypto_LUKS" &&
-+ !libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL) ) {
-+ int num;
-+ char **dm_uuid = libhal_manager_find_device_string_match(m_halContext, "volume.crypto_luks.clear.backing_volume",udi,&num,NULL);
-+ /* if a dm device is found the volume is already decrypted */
-+ if (num == 0) {
-+ // TODO: Check for kryptomedia binary.
-+ KProcess proc;
-+ proc << "kryptomedia" << udi;
-+ proc.start(KProcess::DontCare);
-+ return;
-+ }
-+ }
-+
- /* Query drive udi */
- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
- if ( driveUdi.isNull() ) // no storage - no fun