summaryrefslogtreecommitdiff
path: root/legacy/eeze
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-07-30 09:10:35 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-07-30 09:10:35 +0000
commitd995e25c80ea2a7b5080d7f9e35a6da125fd137a (patch)
treec6e458472f423ce66b5a63e766d7c2436dd1b425 /legacy/eeze
parent68a09359bd3a46412d2adf377ee9cc48c1958c93 (diff)
never attempt to use disk label for mounting
SVN revision: 74563
Diffstat (limited to 'legacy/eeze')
-rw-r--r--legacy/eeze/src/lib/eeze_disk_mount.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/legacy/eeze/src/lib/eeze_disk_mount.c b/legacy/eeze/src/lib/eeze_disk_mount.c
index 4345c6341b..f4bfc13e6b 100644
--- a/legacy/eeze/src/lib/eeze_disk_mount.c
+++ b/legacy/eeze/src/lib/eeze_disk_mount.c
@@ -311,24 +311,13 @@ eeze_disk_mount(Eeze_Disk *disk)
311 mp = eeze_disk_libmount_mp_lookup_by_uuid(disk->cache.uuid); 311 mp = eeze_disk_libmount_mp_lookup_by_uuid(disk->cache.uuid);
312 if (!mp) 312 if (!mp)
313 { 313 {
314 const char *label; 314 const char *devpath;
315 315
316 label = eeze_disk_label_get(disk); 316 devpath = eeze_disk_devpath_get(disk);
317 if (label) 317 if (devpath)
318 { 318 {
319 mp = eeze_disk_libmount_mp_lookup_by_label(label); 319 mp = eeze_disk_libmount_mp_lookup_by_devpath(devpath);
320 eina_stringshare_del(label); 320 eina_stringshare_del(devpath);
321 }
322 if (!mp)
323 {
324 const char *devpath;
325
326 devpath = eeze_disk_devpath_get(disk);
327 if (devpath)
328 {
329 mp = eeze_disk_libmount_mp_lookup_by_devpath(devpath);
330 eina_stringshare_del(devpath);
331 }
332 } 321 }
333 } 322 }
334 if (!eeze_disk_mount_point_set(disk, mp)) 323 if (!eeze_disk_mount_point_set(disk, mp))