From: Markus Frank <m.frank@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/3] added ignore-acl/xattr/ownership & overwrite parameter to proxmox-backup-client
Date: Tue, 16 Aug 2022 11:19:29 +0200 [thread overview]
Message-ID: <20220816091929.26309-4-m.frank@proxmox.com> (raw)
In-Reply-To: <20220816091929.26309-1-m.frank@proxmox.com>
If ignore-acl/ignore-xattr/ignore-ownership is set, the corresponding flag gets
removed.
overwrite-existing-files is saved as an PxarExtractOption like allow-existing-dirs.
Signed-off-by: Markus Frank <m.frank@proxmox.com>
---
proxmox-backup-client/src/main.rs | 40 ++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
index 4bb9aa5e..20c29e26 100644
--- a/proxmox-backup-client/src/main.rs
+++ b/proxmox-backup-client/src/main.rs
@@ -1201,6 +1201,26 @@ We do not extract '.pxar' archives when writing to standard output.
type: CryptMode,
optional: true,
},
+ "ignore-ownership": {
+ type: Boolean,
+ description: "ignore owner settings",
+ optional: true,
+ },
+ "ignore-acl": {
+ type: Boolean,
+ description: "ignore acl errors",
+ optional: true,
+ },
+ "ignore-xattr": {
+ type: Boolean,
+ description: "ignore xattr errors",
+ optional: true,
+ },
+ "overwrite-existing-files": {
+ type: Boolean,
+ description: "overwrite existing files",
+ optional: true,
+ },
}
}
)]
@@ -1210,6 +1230,11 @@ async fn restore(param: Value) -> Result<Value, Error> {
let allow_existing_dirs = param["allow-existing-dirs"].as_bool().unwrap_or(false);
+ let ignore_acls = param["ignore-acl"].as_bool().unwrap_or(false);
+ let ignore_xattrs = param["ignore-xattr"].as_bool().unwrap_or(false);
+ let ignore_ownership = param["ignore-ownership"].as_bool().unwrap_or(false);
+ let overwrite_existing_files = param["overwrite-existing-files"].as_bool().unwrap_or(false);
+
let archive_name = json::required_string_param(¶m, "archive-name")?;
let rate = match param["rate"].as_str() {
@@ -1331,14 +1356,27 @@ async fn restore(param: Value) -> Result<Value, Error> {
match_list: &[],
extract_match_default: true,
allow_existing_dirs,
+ overwrite_existing_files,
on_error: None,
};
+ let mut feature_flags = pbs_client::pxar::Flags::DEFAULT;
+
+ if ignore_ownership {
+ feature_flags.remove(pbs_client::pxar::Flags::WITH_PERMISSIONS);
+ }
+ if ignore_acls {
+ feature_flags.remove(pbs_client::pxar::Flags::WITH_ACL);
+ }
+ if ignore_xattrs {
+ feature_flags.remove(pbs_client::pxar::Flags::WITH_XATTRS);
+ }
+
if let Some(target) = target {
pbs_client::pxar::extract_archive(
pxar::decoder::Decoder::from_std(reader)?,
Path::new(target),
- pbs_client::pxar::Flags::DEFAULT,
+ feature_flags,
|path| {
log::debug!("{:?}", path);
},
--
2.30.2
prev parent reply other threads:[~2022-08-16 9:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-16 9:19 [pbs-devel] [PATCH proxmox-backup 0/3] pbs-client feature #3923 Markus Frank
2022-08-16 9:19 ` [pbs-devel] [PATCH proxmox-backup 1/3] added overwrite-existing-files as Markus Frank
2022-08-16 9:48 ` Markus Frank
2022-08-17 7:31 ` Wolfgang Bumiller
2022-08-16 9:19 ` [pbs-devel] [PATCH proxmox-backup 2/3] skip xattr/acl/ownership options Markus Frank
2022-08-17 7:36 ` Wolfgang Bumiller
2022-08-16 9:19 ` Markus Frank [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220816091929.26309-4-m.frank@proxmox.com \
--to=m.frank@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox