[lxc-devel] [lxd/master] import: remove last dependency on symlink

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 381 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170702/d961c292/attachment.bin>
-------------- next part --------------
From a2cd904d63fb9e882136b24438e4cbf598c3cd33 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Sun, 2 Jul 2017 22:17:56 +0200
Subject: [PATCH] import: remove last dependency on symlink

Closes #3479.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 lxd/api_internal.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lxd/api_internal.go b/lxd/api_internal.go
index 271571844..c01673390 100644
--- a/lxd/api_internal.go
+++ b/lxd/api_internal.go
@@ -183,7 +183,8 @@ func internalImport(d *Daemon, r *http.Request) Response {
 	}
 
 	// Read in the backup.yaml file.
-	backup, err := slurpBackupFile(shared.VarPath("containers", req.Name, "backup.yaml"))
+	backupYamlPath := shared.VarPath("storage-pools", "containers", req.Name, "backup.yaml")
+	backup, err := slurpBackupFile(backupYamlPath)
 	if err != nil {
 		return SmartError(err)
 	}