diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-03 13:34:42 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-03 13:34:42 +0000 |
commit | 2d644a12e4e4d5061eeff8d068db29d562eba35b (patch) | |
tree | 77f04d50c8f05f1853f776f9faf50f89862acdf9 /app-containers/lxd/files | |
parent | 84d7c5e06639a9bcbf66ae744833b34422e478a6 (diff) |
gentoo auto-resync : 03:03:2023 - 13:34:42
Diffstat (limited to 'app-containers/lxd/files')
-rw-r--r-- | app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch b/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch deleted file mode 100644 index c6cf6c97b013..000000000000 --- a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 37779fd75dbcd02fab03a8327a1ec7a6f3273371 Mon Sep 17 00:00:00 2001 -From: Thomas Parrott <thomas.parrott@canonical.com> -Date: Wed, 4 Jan 2023 09:59:37 +0000 -Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Fix getQGroup to - suport BTRFS >= 6.0.1 - -Fixes #11210 - -Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com> ---- - lxd/storage/drivers/driver_btrfs_utils.go | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go -index 8f0846d2fc9f..e1468e4b1a59 100644 ---- a/lxd/storage/drivers/driver_btrfs_utils.go -+++ b/lxd/storage/drivers/driver_btrfs_utils.go -@@ -247,7 +247,8 @@ func (d *btrfs) getQGroup(path string) (string, int64, error) { - var qgroup string - usage := int64(-1) - for _, line := range strings.Split(output, "\n") { -- if line == "" || strings.HasPrefix(line, "qgroupid") || strings.HasPrefix(line, "---") { -+ // Use case-insensitive field title match because BTRFS tooling changed casing between versions. -+ if line == "" || strings.HasPrefix(strings.ToLower(line), "qgroupid") || strings.HasPrefix(line, "-") { - continue - } - |