meson: Support multiple init systems

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

diff --git a/config/init/meson.build b/config/init/meson.build
index 9dacc91ec425bfa466615752722260d082b5b679..5200570bee309ee0d1b6bf49a4372592e571baff 100644 (file)
--- a/config/init/meson.build
+++ b/config/init/meson.build
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if init_script == 'systemd'
+if 'systemd' in init_script
     systemd = dependency('systemd')
     systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
     systemd_service = custom_target(
@@ -15,11 +15,16 @@ if init_script == 'systemd'
         ],
         install: true,
         install_dir: systemd_system_unit_dir)
+endif
 
-elif init_script == 'upstart'
+if 'upstart' in init_script
         install_data('upstart/lxcfs.conf', install_dir: join_paths(sysconfdir, 'init'))
-elif init_script == 'openrc'
+endif
+
+if 'openrc' in init_script
         install_data('sysvinit/lxcfs', install_dir: join_paths(sysconfdir, 'rc.d/init.d'))
-elif init_script == 'sysvinit'
+endif
+
+if 'sysvinit' in init_script
         install_data('sysvinit/lxcfs', install_dir: join_paths(sysconfdir, 'init.d'))
 endif

diff --git a/meson.build b/meson.build
index 57d2ec29474c37938fc496ebe871f0114bab0e00..2cc34e7ab759b1e5e4c3c3c53bbb7595c71666f8 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -71,7 +71,6 @@ init_script = get_option('init-script')
 want_tests = get_option('tests')
 want_docs= get_option('docs')
 
-
 # Build flags.
 possible_cc_flags = [
     '-Wvla',
@@ -307,7 +306,7 @@ status = [
     'lxcfs shared directory:   @0@'.format(lxcfssharedir),
     'lxcfs build root directory:       @0@'.format(project_build_root),
     'lxcfs source root directory:      @0@'.format(project_source_root),
-    'init system:                      @0@'.format(init_script),
+    'init system(s):           @0@'.format(init_script),
     'tests:                            @0@'.format(want_tests),
     'documentation:                    @0@'.format(want_docs),
 ]

diff --git a/meson_options.txt b/meson_options.txt
index d71f2a12c20a448c109b543e4070bf430372dc1e..5566f4cc393c15bde5a82387a510101d50d3511f 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,8 +9,8 @@ option('runtime-path', type : 'string', value : '/run',
 option('with-init-script', type : 'string', value : 'systemd',
        description : 'the runtime directory')
 
-option('init-script', type : 'combo',
-       choices : ['systemd', 'sysvinit', 'openrc', 'upstart'], value : 'systemd',
+option('init-script', type : 'array',
+       choices : ['systemd', 'sysvinit', 'openrc', 'upstart'], value : ['systemd'],
        description : 'init script')
 
 option('docs', type : 'boolean', value: 'true',