[lxc/lxc] 9508fc: conf: userns.conf: include userns.conf.d

[Christian Brauner]

Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: 9508fc2727251995e3a77815359925a8bdd574b6
https://github.com/lxc/lxc/commit/9508fc2727251995e3a77815359925a8bdd574b6
Author: Wolfgang Bumiller <w.bum...@proxmox.com>
Date: 2021-07-05 (Mon, 05 Jul 2021)

Changed paths:
M config/templates/userns.conf.in

Log Message:
-----------
conf: userns.conf: include userns.conf.d

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


Commit: dc73e0f0cb1860203ab54f3db87ba480a249b54e
https://github.com/lxc/lxc/commit/dc73e0f0cb1860203ab54f3db87ba480a249b54e
Author: Wolfgang Bumiller <w.bum...@proxmox.com>
Date: 2021-07-05 (Mon, 05 Jul 2021)

Changed paths:
M src/lxc/confile.c

Log Message:
-----------
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.bum...@proxmox.com>


Commit: 78598e2b30a872b5dc172c222d690a68182b3e05
https://github.com/lxc/lxc/commit/78598e2b30a872b5dc172c222d690a68182b3e05
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-07-05 (Mon, 05 Jul 2021)

Changed paths:
M config/templates/userns.conf.in
M src/lxc/confile.c

Log Message:
-----------
Merge pull request #3896 from Blub/include-userns-config-dir

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


Compare: https://github.com/lxc/lxc/compare/483f5b4f3d92...78598e2b30a8