The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/4577
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Closes #4570.
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 3a527f84516f8e8da9899d763b30d33c70b06a84 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Tue, 22 May 2018 23:08:35 +0200
Subject: [PATCH] lvm: use internal pool name
Closes #4570.
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
lxd/container_lxc.go | 2 +-
lxd/storage_lvm.go | 2 +-
lxd/storage_lvm_utils.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index 5371f214a..c4c5f0d11 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -898,7 +898,7 @@ func (c *containerLXC) initLXC(config bool) error {
if debug {
logLevel = "trace"
} else if verbose {
- logLevel = "info"
+ logLevel = "trace"
}
err = lxcSetConfigItem(cc, "lxc.log.level", logLevel)
diff --git a/lxd/storage_lvm.go b/lxd/storage_lvm.go
index f74b70755..84882ba3f 100644
--- a/lxd/storage_lvm.go
+++ b/lxd/storage_lvm.go
@@ -1048,7 +1048,7 @@ func lvmContainerDeleteInternal(poolName string, ctName
string, isSnapshot bool,
var err error
if isSnapshot {
sourceName, _, _ := containerGetParentAndSnapshotName(ctName)
- snapshotMntPointSymlinkTarget :=
shared.VarPath("storage-pools", poolName, "snapshots", sourceName)
+ snapshotMntPointSymlinkTarget :=
shared.VarPath("storage-pools", s.pool.Name, "snapshots", sourceName)
snapshotMntPointSymlink := shared.VarPath("snapshots",
sourceName)
err = deleteSnapshotMountpoint(containerMntPoint,
snapshotMntPointSymlinkTarget, snapshotMntPointSymlink)
} else {
diff --git a/lxd/storage_lvm_utils.go b/lxd/storage_lvm_utils.go
index 97e5929e3..38813386c 100644
--- a/lxd/storage_lvm_utils.go
+++ b/lxd/storage_lvm_utils.go
@@ -264,7 +264,7 @@ func (s *storageLvm)
createSnapshotContainer(snapshotContainer container, source
if targetIsSnapshot {
targetContainerMntPoint = getSnapshotMountPoint(s.pool.Name,
targetContainerName)
sourceName, _, _ :=
containerGetParentAndSnapshotName(sourceContainerName)
- snapshotMntPointSymlinkTarget :=
shared.VarPath("storage-pools", poolName, "snapshots", sourceName)
+ snapshotMntPointSymlinkTarget :=
shared.VarPath("storage-pools", s.pool.Name, "snapshots", sourceName)
snapshotMntPointSymlink := shared.VarPath("snapshots",
sourceName)
err = createSnapshotMountpoint(targetContainerMntPoint,
snapshotMntPointSymlinkTarget, snapshotMntPointSymlink)
} else {
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
