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

proxmox-systemd: remove crate, use new proxmox-time 1.1.0 instead

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer
2021-11-17 12:29:31 +01:00
parent 729bd1fd16
commit 15cc41b6cb
24 changed files with 26 additions and 1323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api2/node/disks/directory.rs
View File

@ -187,9 +187,9 @@ pub fn create_datastore_disk(
let mount_unit_name = create_datastore_mount_unit(&name, &mount_point, filesystem, &uuid_path)?;
proxmox_systemd::reload_daemon()?;
proxmox_systemd::enable_unit(&mount_unit_name)?;
proxmox_systemd::start_unit(&mount_unit_name)?;
crate::tools::systemd::reload_daemon()?;
crate::tools::systemd::enable_unit(&mount_unit_name)?;
crate::tools::systemd::start_unit(&mount_unit_name)?;
if add_datastore {
let lock = pbs_config::datastore::lock_config()?;
@ -245,7 +245,7 @@ pub fn delete_datastore_disk(name: String) -> Result<(), Error> {
// disable systemd mount-unit
let mut mount_unit_name = proxmox::tools::systemd::escape_unit(&path, true);
mount_unit_name.push_str(".mount");
proxmox_systemd::disable_unit(&mount_unit_name)?;
crate::tools::systemd::disable_unit(&mount_unit_name)?;
// delete .mount-file
let mount_unit_path = format!("/etc/systemd/system/{}", mount_unit_name);

2
src/api2/node/disks/zfs.rs
View File

@ -270,7 +270,7 @@ pub fn create_zpool(
if std::path::Path::new("/lib/systemd/system/zfs-import@.service").exists() {
let import_unit = format!("zfs-import@{}.service", proxmox::tools::systemd::escape_unit(&name, false));
proxmox_systemd::enable_unit(&import_unit)?;
crate::tools::systemd::enable_unit(&import_unit)?;
}
if let Some(compression) = compression {