Merge pull request #3187 from jbaublitz/dbus-signal-fixes

Bug fixes for D-Bus signals in v3.4.0
stratis-storage · Nov 28, 2022 · d4a24f4 · d4a24f4
2 parents 3e61b8c + beee6c1
commit d4a24f4
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/dbus_api/tree.rs b/src/dbus_api/tree.rs
@@ -301,7 +301,7 @@ where
                         consts::POOL_AVAIL_ACTIONS_PROP.to_string() =>
                         box_variant!(avail_prop.clone())
                     },
-                    consts::POOL_INTERFACE_NAME_3_3 => {
+                    consts::POOL_INTERFACE_NAME_3_4 => {
                         Vec::new(),
                         consts::POOL_AVAIL_ACTIONS_PROP.to_string() =>
                         box_variant!(avail_prop)
@@ -700,6 +700,11 @@ where
                     box_variant!(user_info_prop.clone())
                 },
                 consts::POOL_INTERFACE_NAME_3_3 => {
+                    Vec::new(),
+                    consts::BLOCKDEV_USER_INFO_PROP.to_string() =>
+                    box_variant!(user_info_prop.clone())
+                },
+                consts::POOL_INTERFACE_NAME_3_4 => {
                     Vec::new(),
                     consts::BLOCKDEV_USER_INFO_PROP.to_string() =>
                     box_variant!(user_info_prop)
@@ -846,6 +851,11 @@ where
                 consts::BLOCKDEV_NEW_SIZE_PROP.to_string(),
                 blockdev_new_size_to_prop,
                 new_size
+            },
+            consts::BLOCKDEV_INTERFACE_NAME_3_4 => {
+                consts::BLOCKDEV_NEW_SIZE_PROP.to_string(),
+                blockdev_new_size_to_prop,
+                new_size
             }
         )
     }