vidhar: ...

1 files changed, 1 insertions, 15 deletions

diff --git a/hosts/vidhar/borg/copy.py b/hosts/vidhar/borg/copy.py
index 91c65e1e..f685a490 100755
--- a/hosts/vidhar/borg/copy.py
+++ b/hosts/vidhar/borg/copy.py
@@ -115,15 +115,13 @@ def copy_archive(src_repo_path, dst_repo_path, entry):
             for path in [chroot,upper,work]:
                 path.mkdir()
             subprocess.run(['mount', '-t', 'overlay', 'overlay', '-o', f'lowerdir=/,upperdir={upper},workdir={work}', chroot], check=True)
-            bindMounts = ['nix', 'run', 'proc', 'dev', 'sys', pathlib.Path(os.path.expanduser('~')).relative_to('/')]
+            bindMounts = ['nix', 'run', 'run/secrets.d', 'proc', 'dev', 'sys', pathlib.Path(os.path.expanduser('~')).relative_to('/')]
             if os.environ.get('BORG_BASE_DIR'):
                 bindMounts.append(pathlib.Path(os.environ['BORG_BASE_DIR']).relative_to('/'))
             if not ":" in src_repo_path:
                 bindMounts.append(pathlib.Path(src_repo_path).relative_to('/'))
             if 'SSH_AUTH_SOCK' in os.environ:
                 bindMounts.append(pathlib.Path(os.environ['SSH_AUTH_SOCK']).parent.relative_to('/'))
-            if 'CREDENTIALS_DIRECTORY' in os.environ:
-                bindMounts.append(pathlib.Path(os.environ['CREDENTIALS_DIRECTORY']).parent.relative_to('/'))
             for bindMount in bindMounts:
                 (chroot / bindMount).mkdir(parents=True,exist_ok=True)
                 # print(*['mount', '--bind', pathlib.Path('/') / bindMount, chroot / bindMount], file=stderr)
@@ -241,18 +239,6 @@ def sigterm(signum, frame):
 
 def main():
     signal.signal(signal.SIGTERM, sigterm)
-
-    if 'CREDENTIALS_DIRECTORY' in os.environ:
-        def do_chown(path):
-            os.chown(path, borg_pwd.pw_uid, borg_pwd.pw_gid)
-        do_chown(os.environ['CREDENTIALS_DIRECTORY'])
-            
-        for root, dirs, files in os.walk(os.environ['CREDENTIALS_DIRECTORY']):
-            root_path = pathlib.Path(root)
-            for dir in dirs:
-                do_chown(root_path / pathlib.Path(dir))
-            for file in files:
-                do_chown(root_path / pathlib.Path(file))
     
     if "::" in args.source:
         (src_repo_path, _, src_archive) = args.source.partition("::")