diff options
| author | Florian Klink <flokli@flokli.de> | 2020-01-19 22:07:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 22:07:31 +0100 |
| commit | 764aba4c1b7c6461381c0f424fe9ab1951f4c6d3 (patch) | |
| tree | cfa010ce35b088c43f5fc30ad658b8b9ad3f7aa3 /nixos/lib/test-driver | |
| parent | 14aca32d269e5f5dca3a4ff13382eff221cc53c1 (diff) | |
| parent | 6795a4002c1508db2ee23a8d35117a09673c06dd (diff) | |
Merge pull request #77587 from singron/fix-shared
test-driver.py: Share the shared dir between VMs
Diffstat (limited to 'nixos/lib/test-driver')
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 7ac31e18e9d7c..cf204a2619f58 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -221,7 +221,7 @@ class Machine: return path self.state_dir = create_dir("vm-state-{}".format(self.name)) - self.shared_dir = create_dir("{}/xchg".format(self.state_dir)) + self.shared_dir = create_dir("shared-xchg") self.booted = False self.connected = False @@ -576,7 +576,7 @@ class Machine: vm_src = pathlib.Path(source) with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td: shared_temp = pathlib.Path(shared_td) - vm_shared_temp = pathlib.Path("/tmp/xchg") / shared_temp.name + vm_shared_temp = pathlib.Path("/tmp/shared") / shared_temp.name vm_intermediate = vm_shared_temp / vm_src.name intermediate = shared_temp / vm_src.name # Copy the file to the shared directory inside VM |