meson: Add global config

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/config/etc/meson.build b/config/etc/meson.build
new file mode 100644 (file)
index 0000000..04a044a
--- /dev/null
+++ b/config/etc/meson.build
@@ -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)

diff --git a/meson.build b/meson.build
index 322ea2b305a983d0d8b76612084020f4cb3fecd2..553f24e09223c62ed09afdd3865f67651409770b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -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')

diff --git a/meson_options.txt b/meson_options.txt
index 6114cf1b20101f874169ba64be50bfebceaa8670..6f050f8686d40d4710232fb41ce9d2ccf3e76bd6 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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')