From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF5A0158086 for ; Tue, 9 Nov 2021 11:44:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03CE9E094A; Tue, 9 Nov 2021 11:44:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CFFFE094A for ; Tue, 9 Nov 2021 11:44:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5C87342C33 for ; Tue, 9 Nov 2021 11:44:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46164EA for ; Tue, 9 Nov 2021 11:44:31 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1636458118.37d0f50bdb1e7779632a7fe4c6df16158fd2f114.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/, app-emulation/lxd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch app-emulation/lxd/lxd-4.0.8-r1.ebuild app-emulation/lxd/lxd-4.0.8.ebuild X-VCS-Directories: app-emulation/lxd/files/ app-emulation/lxd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 37d0f50bdb1e7779632a7fe4c6df16158fd2f114 X-VCS-Branch: master Date: Tue, 9 Nov 2021 11:44:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 88588c25-f949-421f-8362-9fc7b1ba4efb X-Archives-Hash: 1029e930d237a70d540cdbb2d672473e commit: 37d0f50bdb1e7779632a7fe4c6df16158fd2f114 Author: Joonas Niilola gentoo org> AuthorDate: Tue Nov 9 11:41:58 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Nov 9 11:41:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d0f50b app-emulation/lxd: add fix for >btrfs-progs-5.14 safety check Closes: https://bugs.gentoo.org/822393 Signed-off-by: Joonas Niilola gentoo.org> ...d-4.0.8-btrfs-progs-5.14-safety-check-fix.patch | 75 ++++++++++++++++++++++ .../lxd/{lxd-4.0.8.ebuild => lxd-4.0.8-r1.ebuild} | 2 + 2 files changed, 77 insertions(+) diff --git a/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch b/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch new file mode 100644 index 00000000000..f32debff5e3 --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch @@ -0,0 +1,75 @@ +From 5efac9cfed92a890dc1a073fe60b1c814c305267 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Thu, 4 Nov 2021 14:05:27 -0400 +Subject: [PATCH] lxd/storage/btrfs: Support 5.14.2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Closes #9418 + +Signed-off-by: Stéphane Graber +--- + lxd/storage/drivers/driver_btrfs.go | 18 ++++++++++++++++++ + lxd/storage/drivers/driver_btrfs_utils.go | 8 +++++++- + 2 files changed, 25 insertions(+), 1 deletion(-) + +diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go +index e6a64bf8136..a47be766f8f 100644 +--- a/lxd/storage/drivers/driver_btrfs.go ++++ b/lxd/storage/drivers/driver_btrfs.go +@@ -17,10 +17,12 @@ import ( + "github.com/lxc/lxd/shared/api" + "github.com/lxc/lxd/shared/units" + "github.com/lxc/lxd/shared/validate" ++ "github.com/lxc/lxd/shared/version" + ) + + var btrfsVersion string + var btrfsLoaded bool ++var btrfsPropertyForce bool + + type btrfs struct { + common +@@ -64,6 +66,22 @@ func (d *btrfs) load() error { + } + } + ++ // Check if we need --force to set properties. ++ ver5142, err := version.Parse("5.14.2") ++ if err != nil { ++ return err ++ } ++ ++ ourVer, err := version.Parse(btrfsVersion) ++ if err != nil { ++ return err ++ } ++ ++ // If running 5.14.2 or older, we need --force. ++ if ourVer.Compare(ver5142) > 0 { ++ btrfsPropertyForce = true ++ } ++ + btrfsLoaded = true + return nil + } +diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go +index e1a359e8490..0618e29e6f2 100644 +--- a/lxd/storage/drivers/driver_btrfs_utils.go ++++ b/lxd/storage/drivers/driver_btrfs_utils.go +@@ -308,7 +308,13 @@ func (d *btrfs) setSubvolumeReadonlyProperty(path string, readonly bool) error { + return nil + } + +- _, err := shared.RunCommand("btrfs", "property", "set", "-ts", path, "ro", fmt.Sprintf("%t", readonly)) ++ args := []string{"property", "set"} ++ if btrfsPropertyForce { ++ args = append(args, "-f") ++ } ++ args = append(args, "-ts", path, "ro", fmt.Sprintf("%t", readonly)) ++ ++ _, err := shared.RunCommand("btrfs", args...) + return err + } + diff --git a/app-emulation/lxd/lxd-4.0.8.ebuild b/app-emulation/lxd/lxd-4.0.8-r1.ebuild similarity index 98% rename from app-emulation/lxd/lxd-4.0.8.ebuild rename to app-emulation/lxd/lxd-4.0.8-r1.ebuild index df0bb65646f..feceaec9226 100644 --- a/app-emulation/lxd/lxd-4.0.8.ebuild +++ b/app-emulation/lxd/lxd-4.0.8-r1.ebuild @@ -73,6 +73,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc # make: *** [Makefile:156: check] Error 1 RESTRICT="test" +PATCHES=( "${FILESDIR}"/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch ) + src_prepare() { default