diff --git a/proxmox-rrd/Cargo.toml b/proxmox-rrd/Cargo.toml index 8e9d1b77..3e47ea00 100644 --- a/proxmox-rrd/Cargo.toml +++ b/proxmox-rrd/Cargo.toml @@ -19,6 +19,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_cbor = "0.11.1" -proxmox = { version = "0.15.3" } +#proxmox = { version = "0.15.3" } proxmox-time = "1" proxmox-schema = { version = "1", features = [ "api-macro" ] } +proxmox-sys = "0.2" \ No newline at end of file diff --git a/proxmox-rrd/examples/prrd.rs b/proxmox-rrd/examples/prrd.rs index e00e5a0e..6b6f59ce 100644 --- a/proxmox-rrd/examples/prrd.rs +++ b/proxmox-rrd/examples/prrd.rs @@ -11,7 +11,7 @@ use proxmox_router::cli::{run_cli_command, complete_file_name, CliCommand, CliCo use proxmox_schema::{api, parse_property_string}; use proxmox_schema::{ApiStringFormat, ApiType, IntegerSchema, Schema, StringSchema}; -use proxmox::tools::fs::CreateOptions; +use proxmox_sys::fs::CreateOptions; use proxmox_rrd::rrd::{CF, DST, RRA, RRD}; diff --git a/proxmox-rrd/src/cache.rs b/proxmox-rrd/src/cache.rs index 9bbd89de..b786f14f 100644 --- a/proxmox-rrd/src/cache.rs +++ b/proxmox-rrd/src/cache.rs @@ -10,7 +10,7 @@ use std::collections::BTreeSet; use crossbeam_channel::{bounded, TryRecvError}; use anyhow::{format_err, bail, Error}; -use proxmox::tools::fs::{create_path, CreateOptions}; +use proxmox_sys::fs::{create_path, CreateOptions}; use crate::rrd::{DST, CF, RRD, RRA}; diff --git a/proxmox-rrd/src/cache/journal.rs b/proxmox-rrd/src/cache/journal.rs index a85154a4..fbc8773c 100644 --- a/proxmox-rrd/src/cache/journal.rs +++ b/proxmox-rrd/src/cache/journal.rs @@ -10,7 +10,7 @@ use anyhow::{bail, format_err, Error}; use nix::fcntl::OFlag; use crossbeam_channel::Receiver; -use proxmox::tools::fs::atomic_open_or_create_file; +use proxmox_sys::fs::atomic_open_or_create_file; const RRD_JOURNAL_NAME: &str = "rrd.journal"; diff --git a/proxmox-rrd/src/cache/rrd_map.rs b/proxmox-rrd/src/cache/rrd_map.rs index 6f7686d6..6577fb2e 100644 --- a/proxmox-rrd/src/cache/rrd_map.rs +++ b/proxmox-rrd/src/cache/rrd_map.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use anyhow::{bail, Error}; -use proxmox::tools::fs::create_path; +use proxmox_sys::fs::create_path; use crate::rrd::{CF, DST, RRD}; diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs index 2fab9df3..2aebe1ae 100644 --- a/proxmox-rrd/src/rrd.rs +++ b/proxmox-rrd/src/rrd.rs @@ -18,7 +18,7 @@ use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd}; use anyhow::{bail, format_err, Error}; use serde::{Serialize, Deserialize}; -use proxmox::tools::fs::{make_tmp_file, CreateOptions}; +use proxmox_sys::fs::{make_tmp_file, CreateOptions}; use proxmox_schema::api; use crate::rrd_v1; diff --git a/proxmox-rrd/tests/file_format_test.rs b/proxmox-rrd/tests/file_format_test.rs index b0e0e894..81e49ca3 100644 --- a/proxmox-rrd/tests/file_format_test.rs +++ b/proxmox-rrd/tests/file_format_test.rs @@ -4,7 +4,7 @@ use std::process::Command; use anyhow::{bail, Error}; use proxmox_rrd::rrd::RRD; -use proxmox::tools::fs::CreateOptions; +use proxmox_sys::fs::CreateOptions; fn compare_file(fn1: &str, fn2: &str) -> Result<(), Error> {