[lxc-devel] [lxd/master] lxd/storage/lvm: Correct bad VG name in patch

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 370 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200525/cc0e4e60/attachment.bin>
-------------- next part --------------
From a7974fd02d1412630502b18f472fd0f4ed67920e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 25 May 2020 18:08:48 -0400
Subject: [PATCH] lxd/storage/lvm: Correct bad VG name in patch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7427

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/storage/drivers/driver_lvm_patches.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lxd/storage/drivers/driver_lvm_patches.go b/lxd/storage/drivers/driver_lvm_patches.go
index 559a1bd385..082aedbafe 100644
--- a/lxd/storage/drivers/driver_lvm_patches.go
+++ b/lxd/storage/drivers/driver_lvm_patches.go
@@ -12,9 +12,9 @@ import (
 
 // patchStorageSkipActivation set skipactivation=y on all LXD LVM logical volumes (excluding thin pool volumes).
 func (d *lvm) patchStorageSkipActivation() error {
-	out, err := shared.RunCommand("lvs", "--noheadings", "-o", "lv_name,lv_attr", d.name)
+	out, err := shared.RunCommand("lvs", "--noheadings", "-o", "lv_name,lv_attr", d.config["lvm.vg_name"])
 	if err != nil {
-		return errors.Wrapf(err, "Error getting LVM logical volume list for storage pool %q", d.name)
+		return errors.Wrapf(err, "Error getting LVM logical volume list for storage pool %q", d.config["lvm.vg_name"])
 	}
 
 	for _, line := range strings.Split(out, "\n") {
@@ -33,17 +33,17 @@ func (d *lvm) patchStorageSkipActivation() error {
 
 		// Skip volumes that already have k flag set, meaning setactivationskip=y.
 		if strings.HasSuffix(volAttr, "k") {
-			logger.Infof("Skipping volume %q that already has skipactivation=y set in pool %q", volName, d.name)
+			logger.Infof("Skipping volume %q that already has skipactivation=y set in pool %q", volName, d.config["lvm.vg_name"])
 			continue
 		}
 
 		// Set the --setactivationskip flag enabled on the volume.
-		_, err = shared.RunCommand("lvchange", "--setactivationskip", "y", fmt.Sprintf("%s/%s", d.name, volName))
+		_, err = shared.RunCommand("lvchange", "--setactivationskip", "y", fmt.Sprintf("%s/%s", d.config["lvm.vg_name"], volName))
 		if err != nil {
-			return errors.Wrapf(err, "Error setting setactivationskip=y on LVM logical volume %q for storage pool %q", volName, d.name)
+			return errors.Wrapf(err, "Error setting setactivationskip=y on LVM logical volume %q for storage pool %q", volName, d.config["lvm.vg_name"])
 		}
 
-		logger.Infof("Set setactivationskip=y on volume %q in pool %q", volName, d.name)
+		logger.Infof("Set setactivationskip=y on volume %q in pool %q", volName, d.config["lvm.vg_name"])
 	}
 
 	return nil