meson: rename option sytemd_unit_files to systemd_files

parent be33b6dd
......@@ -40,7 +40,7 @@ build() {
--prefix=/usr \
--sbindir=bin \
-Dkeyfile_default=/etc/trusted-key.key \
-Dsystemd_unit_files=enabled \
-Dsystemd_files=enabled \
-Dclient=enabled \
-Dinstall_kresd_conf=enabled \
-Dunit_tests=enabled
......
......@@ -24,7 +24,7 @@ override_dh_auto_build:
--prefix=/usr \
--libdir=lib \
-Ddoc=enabled \
-Dsystemd_unit_files=enabled \
-Dsystemd_files=enabled \
-Dclient=enabled \
-Dkeyfile_default=/usr/share/dns/root.key \
-Droot_hints=/usr/share/dns/root.hints \
......
......@@ -122,9 +122,9 @@ gpg2 --verify %{SOURCE1} %{SOURCE0}
CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
%if "x%{?rhel}" == "x"
-Ddoc=enabled \
-Dsystemd_unit_files=enabled \
-Dsystemd_files=enabled \
%else
-Dsystemd_unit_files=nosocket \
-Dsystemd_files=nosocket \
%endif
-Dclient=enabled \
-Dunit_tests=enabled \
......
......@@ -260,9 +260,9 @@ unit files themselves.
Depending on your systemd version, choose the appropriate build option:
* ``-Dsystemd_unit_files=enabled`` (recommended) installs unit files with
* ``-Dsystemd_files=enabled`` (recommended) installs unit files with
systemd socket activation support. Requires systemd >=227.
* ``-Dsystemd_unit_files=nosocket`` for systemd <227. Unit files won't use
* ``-Dsystemd_files=nosocket`` for systemd <227. Unit files won't use
socket activation.
To support enabling services after boot, you must also link ``kresd.target`` to
......
......@@ -7,9 +7,9 @@ man_config.set('date', run_command('../scripts/get-date.sh').stdout())
man_config.set('keyfile_default', keyfile_default)
man_config.set('man_seealso_systemd', '')
if systemd_unit_files == 'enabled'
if systemd_files == 'enabled'
man_config.set('man_seealso_systemd', '\\fIkresd.systemd(7)\\fR, ')
elif systemd_unit_files == 'nosocket'
elif systemd_files == 'nosocket'
man_config.set('man_seealso_systemd', '\\fIkresd.systemd.nosocket(7)\\fR, ')
endif
......
# etc: config examples
# Config snippets (build-dependant)
if systemd_unit_files == 'enabled'
if systemd_files == 'enabled'
config_defaults = '''
-- Network interface configuration: see kresd.systemd(7)'''
else
......
......@@ -77,9 +77,9 @@ group = get_option('group')
## Systemd
message('--- systemd socket activation ---')
libsystemd = dependency('libsystemd', version: '>=227', required: false)
systemd_unit_files = get_option('systemd_unit_files')
if systemd_unit_files == 'enabled' and not libsystemd.found()
error('systemd_unit_files=enabled requires libsystemd >= 227')
systemd_files = get_option('systemd_files')
if systemd_files == 'enabled' and not libsystemd.found()
error('systemd_files=enabled requires libsystemd >= 227')
endif
message('---------------------------')
......@@ -162,7 +162,7 @@ subdir('etc')
# Systemd unit files
if systemd_unit_files != 'disabled'
if systemd_files != 'disabled'
subdir('systemd')
endif
......@@ -253,7 +253,7 @@ message('''
systemd:
socket activation: @0@'''.format(s_systemd_socket) + '''
unit_files: @0@'''.format(systemd_unit_files) + '''
files: @0@'''.format(systemd_files) + '''
work_dir: @0@'''.format(systemd_work_dir) + '''
optional components
......
......@@ -65,7 +65,7 @@ option(
## Systemd
option(
'systemd_unit_files',
'systemd_files',
type: 'combo',
choices: [
'disabled',
......@@ -73,7 +73,7 @@ option(
'nosocket',
],
value: 'disabled',
description: 'installs systemd unit files',
description: 'installs systemd-related files',
)
......
......@@ -16,7 +16,7 @@ systemd_config.set('sbin_dir', sbin_dir)
systemd_config.set('etc_dir', etc_dir)
systemd_config.set('run_dir', run_dir)
if systemd_unit_files == 'enabled'
if systemd_files == 'enabled'
## unit files
kresd_service = configure_file(
input: 'kresd@.service.in',
......@@ -70,6 +70,6 @@ if systemd_unit_files == 'enabled'
],
install_dir: join_paths(examples_dir, 'kresd-tls.socket.d'),
)
elif systemd_unit_files == 'nosocket'
elif systemd_files == 'nosocket'
subdir('nosocket')
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment