From 9d18059b8d95af3ad4143f3ea8e721c837fc1639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
Date: Thu, 12 May 2022 15:58:36 +0200
Subject: [PATCH] meson: Add global config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---
 config/etc/meson.build | 8 ++++++++
 meson.build            | 6 ++++--
 meson_options.txt      | 4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 config/etc/meson.build

diff --git a/config/etc/meson.build b/config/etc/meson.build
new file mode 100644
index 000000000..04a044aee
--- /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 322ea2b30..553f24e09 100644
--- 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 6114cf1b2..6f050f868 100644
--- 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')