volume_id: don't probe for mac_partition_maps

[elogind.git] / extras / volume_id / volume_id / volume_id.c

diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/volume_id/volume_id.c
index 4c4a42a00d6ca1902727171fa71c088ea0f8574f..32b91e65ca05397fe1675319abd479fa75b0190c 100644 (file)
--- a/extras/volume_id/volume_id/volume_id.c
+++ b/extras/volume_id/volume_id/volume_id.c
@@ -118,9 +118,6 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
        if (volume_id_probe_vfat(id, off) == 0)
                goto exit;
 
-       if (volume_id_probe_mac_partition_map(id, off) == 0)
-               goto exit;
-
        if (volume_id_probe_xfs(id, off) == 0)
                goto exit;
 
@@ -227,7 +224,7 @@ struct volume_id *volume_id_open_dev_t(dev_t devt)
 
        snprintf(tmp_node, VOLUME_ID_PATH_MAX,
                 "/dev/.volume_id-%u-%u-%u", getpid(), major(devt), minor(devt));
-       tmp_node[VOLUME_ID_PATH_MAX] = '\0';
+       tmp_node[VOLUME_ID_PATH_MAX-1] = '\0';
 
        /* create tempory node to open the block device */
        unlink(tmp_node);