more import cleanups
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
@ -607,7 +607,7 @@ pub struct DeviceLockGuard(std::fs::File);
|
||||
// Uses systemd escape_unit to compute a file name from `device_path`, the try
|
||||
// to lock `/var/lock/<name>`.
|
||||
fn open_device_lock(device_path: &str) -> Result<std::fs::File, Error> {
|
||||
let lock_name = crate::tools::systemd::escape_unit(device_path, true);
|
||||
let lock_name = pbs_systemd::escape_unit(device_path, true);
|
||||
|
||||
let mut path = std::path::PathBuf::from(crate::tape::DRIVE_LOCK_DIR);
|
||||
path.push(lock_name);
|
||||
|
@ -39,8 +39,9 @@ use proxmox::tools::{
|
||||
},
|
||||
};
|
||||
|
||||
use pbs_systemd::time::compute_next_event;
|
||||
|
||||
use crate::{
|
||||
tools::systemd::time::compute_next_event,
|
||||
api2::types::{
|
||||
MediaSetPolicy,
|
||||
RetentionPolicy,
|
||||
|
@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
|
||||
use proxmox::tools::Uuid;
|
||||
|
||||
use pbs_api_types::Fingerprint;
|
||||
use pbs_systemd::time::compute_next_event;
|
||||
|
||||
use crate::{
|
||||
backup::BackupLockGuard,
|
||||
@ -25,7 +26,6 @@ use crate::{
|
||||
RetentionPolicy,
|
||||
MediaPoolConfig,
|
||||
},
|
||||
tools::systemd::time::compute_next_event,
|
||||
tape::{
|
||||
MediaId,
|
||||
MediaSet,
|
||||
|
Reference in New Issue
Block a user