From 376ea264b252074bc53b356ac0da08392fe3045c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 17 Feb 2022 17:32:30 +0100 Subject: vidhar: ... --- hosts/vidhar/borg/copy.py | 2 +- hosts/vidhar/borg/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/vidhar/borg/copy.py b/hosts/vidhar/borg/copy.py index 6adaa817..4e65968d 100755 --- a/hosts/vidhar/borg/copy.py +++ b/hosts/vidhar/borg/copy.py @@ -101,7 +101,7 @@ 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', 'var/lib/borg', 'proc', 'dev', 'sys', pathlib.Path(os.path.expanduser('~')).relative_to('/')] if not ":" in src_repo_path: bindMounts.append(pathlib.Path(src_repo_path).relative_to('/')) if 'SSH_AUTH_SOCK' in os.environ: diff --git a/hosts/vidhar/borg/default.nix b/hosts/vidhar/borg/default.nix index 9201c925..7250c4c7 100644 --- a/hosts/vidhar/borg/default.nix +++ b/hosts/vidhar/borg/default.nix @@ -27,7 +27,7 @@ let StateDirectory = "borg"; RuntimeDirectory = "copy-borg"; Environment = [ - "BORG_RSH=\"${pkgs.openssh}/bin/ssh -vv -F ${sshConfig}\"" + "BORG_RSH=\"${pkgs.openssh}/bin/ssh -F ${sshConfig}\"" "BORG_BASE_DIR=/var/lib/borg" "BORG_CONFIG_DIR=/var/lib/borg/config" "BORG_CACHE_DIR=/var/lib/borg/cache" -- cgit v1.2.3