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

update to nix 0.14, use code from proxmox:tools

Browse Source
This commit is contained in:
Dietmar Maurer
2019-08-03 13:05:38 +02:00
parent b86f263ced
commit e18a6c9ee5
21 changed files with 104 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.rs
View File

@ -7,7 +7,8 @@ use failure::*;
pub mod datastore;
use crate::tools;
use proxmox::tools::try_block;
use crate::buildcfg;
/// Check configuration directory permissions
@ -18,7 +19,7 @@ use crate::buildcfg;
pub fn check_configdir_permissions() -> Result<(), Error> {
let cfgdir = buildcfg::CONFIGDIR;
let (backup_uid, backup_gid) = tools::getpwnam_ugid("backup")?;
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
try_block!({
let stat = nix::sys::stat::stat(cfgdir)?;
@ -43,7 +44,7 @@ pub fn create_configdir() -> Result<(), Error> {
use nix::sys::stat::Mode;
let cfgdir = buildcfg::CONFIGDIR;
let (backup_uid, backup_gid) = tools::getpwnam_ugid("backup")?;
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
match nix::unistd::mkdir(cfgdir, Mode::from_bits_truncate(0o700)) {
Ok(()) => {},