Use own udev namespace for MD-RAID properties

Bug 59759 - as well as the fact we're using both MD_ and MD_MEMBER -
points out a couple of problems with the MD-RAID user space bits. Move
into own namespace for now to avoid pollution from elsewhere.

https://bugs.freedesktop.org/show_bug.cgi?id=59759

Signed-off-by: David Zeuthen <zeuthen@gmail.com>

3 files changed, 13 insertions, 13 deletions

diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
index b761187..6cea92a 100644
--- a/src/udiskslinuxblock.c
+++ b/src/udiskslinuxblock.c
@@ -285,7 +285,7 @@ update_mdraid (UDisksLinuxBlock         *block,
   const gchar *objpath_mdraid_member = "/";
   UDisksLinuxMDRaidObject *object = NULL;
 
-  uuid = g_udev_device_get_property (device->udev_device, "MD_UUID");
+  uuid = g_udev_device_get_property (device->udev_device, "UDISKS_MD_UUID");
   if (uuid != NULL && strlen (uuid) > 0)
     {
       object = find_mdraid (object_manager, uuid);
@@ -296,7 +296,7 @@ update_mdraid (UDisksLinuxBlock         *block,
         }
     }
 
-  uuid = g_udev_device_get_property (device->udev_device, "MD_MEMBER_UUID");
+  uuid = g_udev_device_get_property (device->udev_device, "UDISKS_MD_MEMBER_UUID");
   if (uuid != NULL && strlen (uuid) > 0)
     {
       object = find_mdraid (object_manager, uuid);
@@ -829,7 +829,7 @@ udisks_linux_block_update (UDisksLinuxBlock        *block,
     {
       const gchar *md_name;
 
-      md_name = g_udev_device_get_property (device->udev_device, "MD_NAME");
+      md_name = g_udev_device_get_property (device->udev_device, "UDISKS_MD_NAME");
       if (md_name != NULL)
         {
           gchar *md_name_dev_file = NULL;
diff --git a/src/udiskslinuxmdraid.c b/src/udiskslinuxmdraid.c
index c5541d3..39d8e95 100644
--- a/src/udiskslinuxmdraid.c
+++ b/src/udiskslinuxmdraid.c
@@ -311,18 +311,18 @@ udisks_linux_mdraid_update (UDisksLinuxMDRaid       *mdraid,
   if (member_devices != NULL)
     {
       device = UDISKS_LINUX_DEVICE (member_devices->data);
-      num_devices = g_udev_device_get_property_as_int (device->udev_device, "MD_MEMBER_DEVICES");
-      level = g_udev_device_get_property (device->udev_device, "MD_MEMBER_LEVEL");
-      uuid = g_udev_device_get_property (device->udev_device, "MD_MEMBER_UUID");
-      name = g_udev_device_get_property (device->udev_device, "MD_MEMBER_NAME");
+      num_devices = g_udev_device_get_property_as_int (device->udev_device, "UDISKS_MD_MEMBER_DEVICES");
+      level = g_udev_device_get_property (device->udev_device, "UDISKS_MD_MEMBER_LEVEL");
+      uuid = g_udev_device_get_property (device->udev_device, "UDISKS_MD_MEMBER_UUID");
+      name = g_udev_device_get_property (device->udev_device, "UDISKS_MD_MEMBER_NAME");
     }
   else
     {
       device = UDISKS_LINUX_DEVICE (raid_device);
-      num_devices = g_udev_device_get_property_as_int (device->udev_device, "MD_DEVICES");
-      level = g_udev_device_get_property (device->udev_device, "MD_LEVEL");
-      uuid = g_udev_device_get_property (device->udev_device, "MD_UUID");
-      name = g_udev_device_get_property (device->udev_device, "MD_NAME");
+      num_devices = g_udev_device_get_property_as_int (device->udev_device, "UDISKS_MD_DEVICES");
+      level = g_udev_device_get_property (device->udev_device, "UDISKS_MD_LEVEL");
+      uuid = g_udev_device_get_property (device->udev_device, "UDISKS_MD_UUID");
+      name = g_udev_device_get_property (device->udev_device, "UDISKS_MD_NAME");
     }
 
   /* figure out size */
diff --git a/src/udiskslinuxprovider.c b/src/udiskslinuxprovider.c
index 677a193..0c247fe 100644
--- a/src/udiskslinuxprovider.c
+++ b/src/udiskslinuxprovider.c
@@ -694,8 +694,8 @@ handle_block_uevent_for_mdraid (UDisksLinuxProvider *provider,
    * For removal, we also need to consider the case where there is no
    * UUID.
    */
-  uuid = g_udev_device_get_property (device->udev_device, "MD_UUID");
-  member_uuid = g_udev_device_get_property (device->udev_device, "MD_MEMBER_UUID");
+  uuid = g_udev_device_get_property (device->udev_device, "UDISKS_MD_UUID");
+  member_uuid = g_udev_device_get_property (device->udev_device, "UDISKS_MD_MEMBER_UUID");
 
   if (uuid != NULL)
     handle_block_uevent_for_mdraid_with_uuid (provider, action, device, uuid, FALSE);