From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 5 Jul 2021 07:02:36 +0000 (+0200)
Subject: conf: userns.conf: include userns.conf.d
X-Git-Tag: lxc-5.0.0~142^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9508fc2727251995e3a77815359925a8bdd574b6;p=thirdparty%2Flxc.git

conf: userns.conf: include userns.conf.d

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---

diff --git a/config/templates/userns.conf.in b/config/templates/userns.conf.in
index 69d992680..255dd01a3 100644
--- a/config/templates/userns.conf.in
+++ b/config/templates/userns.conf.in
@@ -19,3 +19,6 @@ lxc.tty.dir =
 
 # Setup the default mounts
 lxc.mount.auto = sys:rw
+
+# Lastly, include all the configs from @LXCTEMPLATECONFIG@/userns.conf.d/
+lxc.include = @LXCTEMPLATECONFIG@/userns.conf.d/