Proxmox/lxc
5
0
Fork 0
mirror of git://git.proxmox.com/git/lxc.git synced 2025-03-16 10:50:38 +03:00
Code Releases Activity

add patch to include userns.conf.d/

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-07-05 09:04:43 +02:00
parent 7dae6e95cb
commit 27a22db977
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debian/patches/pve/0010-conf-userns.conf-include-userns.conf.d.patch vendored Normal file
View File

@ -0,0 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 5 Jul 2021 09:02:36 +0200
Subject: [PATCH] conf: userns.conf: include userns.conf.d
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
config/templates/userns.conf.in | 3 +++
1 file changed, 3 insertions(+)
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/

36
debian/patches/pve/0011-confile-allow-including-nonexisting-directories.patch vendored Normal file
View File

@ -0,0 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 5 Jul 2021 10:53:41 +0200
Subject: [PATCH] confile: allow including nonexisting directories
If an include directive ends with a trailing slash, we now
always assume it is a directory and do not treat the
non-existence as an error.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
src/lxc/confile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 6e2b68b1c..7f4fb13fb 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2689,7 +2689,7 @@ static int do_includedir(const char *dirp, struct lxc_conf *lxc_conf)
dir = opendir(dirp);
if (!dir)
- return -errno;
+ return errno == ENOENT ? 0 : -errno;
while ((direntp = readdir(dir))) {
const char *fnam;
@@ -2726,7 +2726,7 @@ static int set_config_includefiles(const char *key, const char *value,
return 0;
}
- if (is_dir(value))
+ if (value[strlen(value)-1] == '/' || is_dir(value))
return do_includedir(value, lxc_conf);
return lxc_config_read(value, lxc_conf, true);

2
debian/patches/series vendored
View File

@ -7,3 +7,5 @@ pve/0006-doc-Add-lxc.cgroup.dir.-monitor-container-container..patch
pve/0007-PVE-Config-lxc.service-start-after-a-potential-syslo.patch
pve/0008-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
pve/0009-PVE-Config-attach-always-use-getent.patch
pve/0010-conf-userns.conf-include-userns.conf.d.patch
pve/0011-confile-allow-including-nonexisting-directories.patch