meson: Add global config

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Stéphane Graber 2022-05-12 15:58:36 +02:00
parent 053cb087b6
commit 9d18059b8d
No known key found for this signature in database
GPG Key ID: C638974D64792D67
3 changed files with 14 additions and 4 deletions

8
config/etc/meson.build Normal file
View File

@ -0,0 +1,8 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
lxc_system_config = configure_file(
configuration: dummy_config_data,
input: 'default.conf.lxcbr',
output: 'default.conf',
install: true,
install_dir: lxcconfdir)

View File

@ -69,9 +69,10 @@ sbindir = join_paths(prefixdir, get_option('sbindir'))
sysconfdir = join_paths(prefixdir, get_option('sysconfdir'))
lxcapparmorcachedir = join_paths(localstatedir, apparmorcachedir)
lxcdefaultconfig = join_paths(sysconfdir, 'lxc/default.conf')
lxcconfdir = join_paths(sysconfdir, globalconfig)
lxcdefaultconfig = join_paths(lxcconfdir, 'default.conf')
lxcglobalconfig = join_paths(lxcconfdir, 'lxc.conf')
lxcexamplesdir = join_paths(docdir, 'examples')
lxcglobalconfig = join_paths(sysconfdir, globalconfig)
lxchookbindir = join_paths(libexecdir, 'lxc/hooks')
lxchookdir = join_paths(datadir, 'lxc/hooks')
lxcinclude = join_paths(includedir, 'lxc')
@ -594,6 +595,7 @@ liblxc_dep = declare_dependency(
# Rest of sub-directories.
subdir('config/bash')
subdir('config/etc')
subdir('doc/examples')
subdir('doc/rootfs')
subdir('hooks')

View File

@ -30,8 +30,8 @@ option('data-path', type: 'string', value: 'lib/lxc',
option('doc-path', type: 'string', value: 'doc/lxc',
description: 'Documentation directory')
option('global-config-path', type: 'string', value: 'lxc/lxc.conf',
description: 'Global configuration file path')
option('global-config-path', type: 'string', value: 'lxc',
description: 'Global configuration directory')
option('log-path', type: 'string', value: 'log/lxc',
description: 'Loging directory')