From e409c11e67f0ba1970458973d93b1f7a970f3de6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 24 Jun 2024 20:05:38 -0600 Subject: [PATCH] 0.2.23: fix install from inside Redox --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 2 +- src/lib.rs | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0003dd190..7e116823bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,9 +164,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blake2" @@ -623,7 +623,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8283e7331b8c93b9756e0cfdbcfb90312852f953c6faf9bf741e684cc3b6ad69" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crc", "log 0.4.21", "uuid", @@ -833,7 +833,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -844,7 +844,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.5.2", ] @@ -1163,7 +1163,7 @@ dependencies = [ [[package]] name = "redox_installer" -version = "0.2.22" +version = "0.2.23" dependencies = [ "arg_parser", "cc", @@ -1248,7 +1248,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1364,7 +1364,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1800,9 +1800,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea73390fe27785838dcbf75b91b1d84799e28f1ce71e6f372a5dc2200c80de5" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom 0.2.15", ] diff --git a/Cargo.toml b/Cargo.toml index b356d945d4..20e92a41d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "redox_installer" -version = "0.2.22" +version = "0.2.23" description = "A Redox filesystem builder" license = "MIT" authors = ["Jeremy Soller "] diff --git a/src/lib.rs b/src/lib.rs index 65663c539d..7726e7bc0a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -312,7 +312,7 @@ pub fn with_redoxfs(disk: D, password_opt: Option<&[u8]>, callback: F) F: FnOnce(&Path) -> Result { let mount_path = if cfg!(target_os = "redox") { - format!("file/redox_installer_{}", process::id()) + format!("file.redox_installer_{}", process::id()) } else { format!("/tmp/redox_installer_{}", process::id()) };