[lxc-devel] [lxd/master] lxd/storage/btrfs: Fix usage inside containers

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200115/e1797b18/attachment.bin>
-------------- next part --------------
From 2cede8c421b04cc295df93e28be455745a6495dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 15 Jan 2020 10:22:57 -0500
Subject: [PATCH] lxd/storage/btrfs: Fix usage inside containers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go
index d508709fc8..5001366582 100644
--- a/lxd/storage/drivers/driver_btrfs.go
+++ b/lxd/storage/drivers/driver_btrfs.go
@@ -244,6 +244,11 @@ func (d *btrfs) Update(changedConfig map[string]string) error {
 		return nil
 	}
 
+	// Custom mount options don't work inside containers
+	if d.state.OS.RunningInUserNS {
+		return nil
+	}
+
 	// Trigger a re-mount.
 	d.config["btrfs.mount_options"] = val
 	mntFlags, mntOptions := resolveMountOptions(d.getMountOptions())
@@ -305,6 +310,11 @@ func (d *btrfs) Mount() (bool, error) {
 			return false, err
 		}
 
+		// Custom mount options don't work inside containers
+		if !d.state.OS.RunningInUserNS {
+			return true, nil
+		}
+
 		// Now apply the custom options.
 		mntFlags |= unix.MS_REMOUNT
 		err = TryMount("", mntDst, mntFilesystem, mntFlags, mntOptions)