tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update to nix 0.24 / rustyline 9 / proxmox-sys 0.3

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2022-06-02 13:10:33 +02:00
parent 68a6e970d4
commit 11ca834317
34 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pbs-fuse-loop/Cargo.toml
View File

@ -10,10 +10,10 @@ anyhow = "1.0"
futures = "0.3"
lazy_static = "1.4"
libc = "0.2"
nix = "0.19.1"
nix = "0.24"
regex = "1.5"
tokio = { version = "1.6", features = [] }
proxmox-time = "1"
proxmox-fuse = "0.1.1"
proxmox-sys = "0.2"
proxmox-sys = "0.3"

4
pbs-fuse-loop/src/fuse_loop.rs
View File

@ -330,7 +330,7 @@ fn unmap_from_backing(backing_file: &Path, loopdev: Option<&str>) -> Result<(),
// send SIGINT to trigger cleanup and exit in target process
match signal::kill(pid, Signal::SIGINT) {
Ok(()) => {}
Err(nix::Error::Sys(nix::errno::Errno::ESRCH)) => {
Err(nix::errno::Errno::ESRCH) => {
emerg_cleanup(loopdev, backing_file.to_owned());
return Ok(());
}
@ -348,7 +348,7 @@ fn unmap_from_backing(backing_file: &Path, loopdev: Option<&str>) -> Result<(),
}
std::thread::sleep(std::time::Duration::from_millis(100));
}
Err(nix::Error::Sys(nix::errno::Errno::ESRCH)) => {
Err(nix::errno::Errno::ESRCH) => {
break;
}
Err(e) => return Err(e.into()),