From 69b373acd6079f857462a0653c12e86f74bb00b1 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 17 Feb 2022 15:55:30 +0100 Subject: vidhar: ... --- hosts/vidhar/borg/copy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hosts/vidhar/borg/copy.py') diff --git a/hosts/vidhar/borg/copy.py b/hosts/vidhar/borg/copy.py index 9402560c..4858db78 100755 --- a/hosts/vidhar/borg/copy.py +++ b/hosts/vidhar/borg/copy.py @@ -98,8 +98,8 @@ def copy_archive(src_repo_path, dst_repo_path, entry): unshare.unshare(unshare.CLONE_NEWNS | unshare.CLONE_NEWUSER) ps_effective = {pyprctl.Cap.SETUID, pyprctl.Cap.SETGID} ps_ambient = {pyprctl.Cap.SYS_ADMIN} - pyprctl.cap_permitted.add(*(ps_effective + ps_ambient)) - pyprctl.cap_effective.add(*(ps_effective + ps_ambient)) + pyprctl.cap_permitted.add(*(ps_effective | ps_ambient)) + pyprctl.cap_effective.add(*(ps_effective | ps_ambient)) pyprctl.cap_inheritable.add(*ps_ambient) pyprctl.cap_ambient.add(*ps_ambient) with open('/proc/self/uid_map', 'r') as uid_map: -- cgit v1.2.3