From a24b72c4de52ab0421b72a8894f6e2e135df7b84 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 18 Nov 2021 13:43:41 +0100 Subject: [PATCH] use proxmox::tools::fd::fd_change_cloexec from proxmox 0.15.3 Depend on proxmox 0.15.3 Signed-off-by: Dietmar Maurer --- proxmox-rest-server/Cargo.toml | 2 +- proxmox-rest-server/src/daemon.rs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/proxmox-rest-server/Cargo.toml b/proxmox-rest-server/Cargo.toml index b88e5d12..f0c0c65e 100644 --- a/proxmox-rest-server/Cargo.toml +++ b/proxmox-rest-server/Cargo.toml @@ -30,7 +30,7 @@ tokio-openssl = "0.6.1" tower-service = "0.3.0" url = "2.1" -proxmox = "0.15.0" +proxmox = "0.15.3" proxmox-io = "1" proxmox-lang = "1" proxmox-http = { version = "0.5.0", features = [ "client" ] } diff --git a/proxmox-rest-server/src/daemon.rs b/proxmox-rest-server/src/daemon.rs index cbaaaa7b..c533b0f4 100644 --- a/proxmox-rest-server/src/daemon.rs +++ b/proxmox-rest-server/src/daemon.rs @@ -13,11 +13,9 @@ use anyhow::{bail, format_err, Error}; use futures::future::{self, Either}; use nix::unistd::{fork, ForkResult}; -use proxmox::tools::fd::Fd; +use proxmox::tools::fd::{fd_change_cloexec, Fd}; use proxmox_io::{ReadExt, WriteExt}; -use pbs_tools::fd::fd_change_cloexec; - // Unfortunately FnBox is nightly-only and Box is unusable, so just use Box... type BoxedStoreFunc = Box Result + UnwindSafe + Send>;