diff --git a/Cargo.lock b/Cargo.lock index fd2d4da657..5465e43a0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,13 +124,14 @@ dependencies = [ [[package]] name = "devicemapper" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", "macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mnt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "newtype_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", @@ -240,14 +241,14 @@ dependencies = [ [[package]] name = "libstratis" -version = "0.5.2" +version = "0.5.3" dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.29.0 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "dbus 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "devicemapper 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "devicemapper 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -263,7 +264,7 @@ dependencies = [ "serde 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -528,7 +529,7 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", @@ -669,7 +670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum crc 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc1914fae6f18ae347320f0ba5e4fc270e17c037ea621fe41ec7e8adf67d11b0" "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850" "checksum dbus 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2c58aab20dd6637871e6e03cb6122f00b496a91eb65b688639c940012d8710" -"checksum devicemapper 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2157d008e4e54b974a0ab725e1f7a7e57512e9ec8c169f62633ee6b18f7fae" +"checksum devicemapper 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67bd94a17d97b0c0fa1f9f951b232a8580fd4975862e8a8c0d6c3fd5cc059d45" "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a" "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b" @@ -718,7 +719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -"checksum tempfile 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8cddbd26c5686ece823b507f304c8f188daef548b4cb753512d929ce478a093c" +"checksum tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47776f63b85777d984a50ce49d6b9e58826b6a3766a449fc95bc66cd5663c15b" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" "checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693" "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14" diff --git a/Cargo.toml b/Cargo.toml index feea09874b..05bc2bbab3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "libstratis" -version = "0.5.2" +version = "0.5.3" authors = ["Stratis Developers "] [dependencies] dbus = {version = "0.6.1", optional = true} clap = "2" nix = "0.10" -devicemapper = "0.20.0" +devicemapper = "0.21.0" crc = "1" byteorder = "1" chrono = "0.4" diff --git a/src/engine/strat_engine/tests/util.rs b/src/engine/strat_engine/tests/util.rs index dae1afea4b..dc4dfaec66 100644 --- a/src/engine/strat_engine/tests/util.rs +++ b/src/engine/strat_engine/tests/util.rs @@ -8,7 +8,7 @@ use std::path::PathBuf; use mnt::get_submounts; use nix::mount::{MntFlags, umount2}; -use devicemapper::{DevId, DmFlags}; +use devicemapper::{DevId, DmOptions}; use super::super::dm::get_dm; @@ -44,7 +44,7 @@ fn dm_stratis_devices_remove() -> Result<()> { .map(|d| &d.0) .filter(|n| n.to_string().starts_with("stratis-1")) { - match get_dm().device_remove(&DevId::Name(n), DmFlags::empty()) { + match get_dm().device_remove(&DevId::Name(n), &DmOptions::new()) { Ok(_) => progress_made = true, Err(_) => remain.push(n.to_string()), }