Skip to content

Commit e2bf45e

Browse files
committed
Add forgotten MetadataVersion property
1 parent 17f0d7f commit e2bf45e

3 files changed

Lines changed: 20 additions & 3 deletions

File tree

src/dbus/pool/pool_3_8/mod.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ pub use methods::{
5151
bind_clevis_method, bind_keyring_method, rebind_clevis_method, rebind_keyring_method,
5252
unbind_clevis_method, unbind_keyring_method,
5353
};
54-
pub use props::{clevis_infos_prop, free_token_slots_prop, key_descs_prop, volume_key_loaded_prop};
54+
pub use props::{
55+
clevis_infos_prop, free_token_slots_prop, key_descs_prop, metadata_version_prop,
56+
volume_key_loaded_prop,
57+
};
5558

5659
pub struct PoolR8 {
5760
connection: Arc<Connection>,
@@ -407,4 +410,9 @@ impl PoolR8 {
407410
async fn volume_key_loaded(&self) -> Result<Value<'_>, Error> {
408411
pool_prop(&self.engine, self.uuid, volume_key_loaded_prop).await
409412
}
413+
414+
#[zbus(property(emits_changed_signal = "false"))]
415+
async fn metadata_version(&self) -> Result<u64, Error> {
416+
pool_prop(&self.engine, self.uuid, metadata_version_prop).await
417+
}
410418
}

src/dbus/pool/pool_3_8/props.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ pub fn free_token_slots_prop(guard: SomeLockReadGuard<PoolUuid, dyn Pool>) -> (b
1414
option_to_tuple(guard.free_token_slots(), 0)
1515
}
1616

17+
pub fn metadata_version_prop(guard: SomeLockReadGuard<PoolUuid, dyn Pool>) -> u64 {
18+
guard.metadata_version() as u64
19+
}
20+
1721
pub fn volume_key_loaded_prop<'a>(guard: SomeLockReadGuard<PoolUuid, dyn Pool>) -> Value<'a> {
1822
let (_, pool_uuid, pool) = guard.as_tuple();
1923
match pool.volume_key_is_loaded(pool_uuid) {

src/dbus/pool/pool_3_9/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ use crate::{
3535
pool_3_7::{filesystem_metadata_method, metadata_method},
3636
pool_3_8::{
3737
bind_clevis_method, bind_keyring_method, clevis_infos_prop, free_token_slots_prop,
38-
key_descs_prop, rebind_clevis_method, rebind_keyring_method, unbind_clevis_method,
39-
unbind_keyring_method, volume_key_loaded_prop,
38+
key_descs_prop, metadata_version_prop, rebind_clevis_method, rebind_keyring_method,
39+
unbind_clevis_method, unbind_keyring_method, volume_key_loaded_prop,
4040
},
4141
shared::{pool_prop, set_pool_prop, try_pool_prop},
4242
},
@@ -403,4 +403,9 @@ impl PoolR9 {
403403
async fn volume_key_loaded(&self) -> Result<Value<'_>, Error> {
404404
pool_prop(&self.engine, self.uuid, volume_key_loaded_prop).await
405405
}
406+
407+
#[zbus(property(emits_changed_signal = "false"))]
408+
async fn metadata_version(&self) -> Result<u64, Error> {
409+
pool_prop(&self.engine, self.uuid, metadata_version_prop).await
410+
}
406411
}

0 commit comments

Comments
 (0)