add fallback for mounting when a disk has no uuid

SVN revision: 72008

diff --git a/legacy/eeze/ChangeLog b/legacy/eeze/ChangeLog
index 141de8f..5eed25b 100644 (file)
--- a/legacy/eeze/ChangeLog
+++ b/legacy/eeze/ChangeLog
@@ -88,3 +88,7 @@
 2012-06-11 Mike Blumenkrantz
 
         * eeze_scanner socket is now readable by anyone
+
+2012-06-12 Mike Blumenkrantz
+
+        * Add fallback mount using device name if a disk has no uuid

diff --git a/legacy/eeze/src/lib/eeze_disk_mount.c b/legacy/eeze/src/lib/eeze_disk_mount.c
index 42dbc62..5de67fb 100644 (file)
--- a/legacy/eeze/src/lib/eeze_disk_mount.c
+++ b/legacy/eeze/src/lib/eeze_disk_mount.c
@@ -247,9 +247,15 @@ eeze_disk_mount(Eeze_Disk *disk)
 
    if (disk->mount_cmd_changed)
      {
+        const char *dev, *str;
         eina_strbuf_string_free(disk->mount_cmd);
-        if (!disk->cache.uuid)
-          disk->cache.uuid = udev_device_get_property_value(disk->device, "ID_FS_UUID");
+        dev = eeze_disk_uuid_get(disk);
+        if (dev) str = "UUID=";
+        else
+          {
+             dev = eeze_disk_devpath_get(disk);
+             str = NULL;
+          }
 
         if (!disk->mount_point)
           {
@@ -287,9 +293,9 @@ eeze_disk_mount(Eeze_Disk *disk)
         if (disk->mount_wrapper)
           eina_strbuf_append_printf(disk->mount_cmd, "%s ", disk->mount_wrapper);
         if (disk->mount_opts == EEZE_DISK_MOUNTOPT_DEFAULTS)
-          eina_strbuf_append_printf(disk->mount_cmd, EEZE_MOUNT_BIN" -o "EEZE_MOUNT_DEFAULT_OPTS" UUID=%s %s", disk->cache.uuid, disk->mount_point);
+          eina_strbuf_append_printf(disk->mount_cmd, EEZE_MOUNT_BIN" -o "EEZE_MOUNT_DEFAULT_OPTS" %s%s %s", str ?: "", dev, disk->mount_point);
         else if (!disk->mount_opts)
-          eina_strbuf_append_printf(disk->mount_cmd, EEZE_MOUNT_BIN" UUID=%s %s", disk->cache.uuid, disk->mount_point);
+          eina_strbuf_append_printf(disk->mount_cmd, EEZE_MOUNT_BIN" %s%s %s", str ?: "", dev, disk->mount_point);
         else
           {
              eina_strbuf_append(disk->mount_cmd, EEZE_MOUNT_BIN" -o ");
@@ -312,7 +318,7 @@ eeze_disk_mount(Eeze_Disk *disk)
                eina_strbuf_append(disk->mount_cmd, "remount,");
              if (disk->mount_opts & EEZE_DISK_MOUNTOPT_UID)
                eina_strbuf_append_printf(disk->mount_cmd, "uid=%i,", (int)disk->uid);
-             eina_strbuf_append_printf(disk->mount_cmd, " UUID=%s %s", disk->cache.uuid, disk->mount_point);
+             eina_strbuf_append_printf(disk->mount_cmd, " %s%s %s", str ?: "", dev, disk->mount_point);
           }
         disk->mount_cmd_changed = EINA_FALSE;
      }