diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-23 00:11:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-23 00:11:31 +0100 |
| commit | bff543bb632933380da922cbfc07c67157d72d42 (patch) | |
| tree | df2e5eebc3dbd8e29153ab3a869b3be8d9be9f19 /app-containers/lxd | |
| parent | 491d0101c89d81dec507f28215b3cb094800d600 (diff) | |
gentoo auto-resync : 23:06:2024 - 00:11:30
Diffstat (limited to 'app-containers/lxd')
| -rw-r--r-- | app-containers/lxd/Manifest | 1 | ||||
| -rw-r--r-- | app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch | 52 |
2 files changed, 0 insertions, 53 deletions
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 51250745b58c..60ff06d30264 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -2,7 +2,6 @@ AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df11 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661 AUX lxd-4.0.9-r1.service 612 BLAKE2B e44029b6f615afc0daf8abfccd7d2e472291d9b1f8530b64f5c9b7d96aeda605a0dd0ec9b74f0a79f68992a45607e4362a7c30c711b34ac106b9377610f97ad6 SHA512 68800d9952e865eeffe1c05ecf111c49e6b137c6f7af7c7b02daf180c3a794a670ddbe7140e97d187f1b9a803ca84e132303808ed8b6ae49760246c01d7c60d4 AUX lxd-5.0.2-r1.initd 1710 BLAKE2B a9597d32e88502f521f3ae784e4f653ab6d3ab144537b27f5e9b84eb36e5688b13d74968c865153d6e442f77a67b5794fb429705bea8b40cdef00768102de55b SHA512 73ea4aaee39061565524a378b9317bee4b850f0c28ae3f8a47e905b9dffc4452e71736880391bb74b88ea70bda12874699a1eff56400ac9d7949738f3aa3ebce -AUX lxd-5.0.3-btrfs-quota-group-fix.patch 1762 BLAKE2B c26a2cfe479cace5dda6bccf09c4c67d5e787fb0595da58959c182ec866b7a22ebed11856b29feb77a24d4b44fed213dae649f3b74fd55f6211c8c98f3a8d55d SHA512 0438c12eb728a968ec80562e6ca839ab14cb7c09294ae527a8e20e24e927e8941f87ffc8a145f4931bb8867f5ad2cdf61c965f29f0320e5716aa387dbd3e5880 AUX lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch 3091 BLAKE2B d21b6bbc168579fdb43845bdfadf1fa4514b3e8abb9e49d171fc5a576eef73a827a573e75d4ced65225659db998cce7eb3eb90f3c2a558dc0c83255c799c582b SHA512 6a5d1c64045266697ecfa6cf970640e7dc705436af71c2d20fb1f0c978020b2a20698f8ddd43f60d444c3f460d9520d644fe9bf8c8ed28aba77f88ff7349053c AUX lxd-5.0.3-pr-12847-ignore-incus-archives.patch 1052 BLAKE2B 13f360b09a9bf3224f23f1d95ca9b4ee714a3c8e32c981acaededdfce3833d51e700a2e7b12c79b4d79ad99925d156ec57159114c6668d5a2261316a14ed4581 SHA512 4e34878214d96a165b4762f0c39bfa7279677af65a6a9452da2d19e6b1f87d8a4cd1fe5c3cb55e20662c82e1682ac5ae9848bf5c4c61b5ca2f1d58e2f9e62cfb AUX lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch 992 BLAKE2B 861128f47f9ad4e3e1ed6ec06f563339c58c8ad1f8d30a25c2ae043d34b519c6b6e1a17dc77bfccc37e65ffc1f72ed8dfd455292ce3b5bf2c00496edb5dad675 SHA512 af551a0461d0fb7044bf6f12a0d4f66d96215f05009a1a096b361824b63170e7e08b9065a310dcc885a73c5f1eea99ee52f7680fb94d3dacffaf6e38d5a26472 diff --git a/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch b/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch deleted file mode 100644 index 4e993b7e7054..000000000000 --- a/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e7c852e43c0479060e630adb50342d2552a6cdad Mon Sep 17 00:00:00 2001 -From: Thomas Parrott <thomas.parrott@canonical.com> -Date: Tue, 7 Feb 2023 10:04:27 +0000 -Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Only check for - minimum number of columns in `btrfs qgroup show` command - -Previously we expected 4 columns, but in btrfs-progs >= 6.0 this has changed to 5 columns. - -E.g. in Jammy btrfs-progs v5.16.2: - -``` -sudo btrfs qgroup show /var/lib/lxd/storage-pools/btrfs -qgroupid rfer excl --------- ---- ---- -0/5 16.00KiB 16.00KiB -0/256 9.66MiB 400.00KiB -0/257 9.66MiB 392.00KiB -``` - -And in Lunar btrfs-progs v6.1.3: - -``` -btrfs qgroup show /var/lib/lxd/storage-pools/btrfs -Qgroupid Referenced Exclusive Path --------- ---------- --------- ---- -0/5 16.00KiB 16.00KiB <toplevel> -0/256 9.63MiB 400.00KiB images/1f81470478d136f0008c856e3a47369e0ac863f0402ce0e31c56dd29e9fdd4d7 -0/257 9.64MiB 404.00KiB containers/c1 -``` - -Fixes #11210 - -Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com> ---- - lxd/storage/drivers/driver_btrfs_utils.go | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go -index e1468e4b1a59..722a2de20978 100644 ---- a/lxd/storage/drivers/driver_btrfs_utils.go -+++ b/lxd/storage/drivers/driver_btrfs_utils.go -@@ -253,7 +253,9 @@ func (d *btrfs) getQGroup(path string) (string, int64, error) { - } - - fields := strings.Fields(line) -- if len(fields) != 4 { -+ -+ // The BTRFS tooling changed the number of columns between versions so we only check for minimum. -+ if len(fields) < 3 { - continue - } - |