mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-08 00:34:49 +00:00
meson: allow systemd sysusersdir to be changed
We currently hardcode the systemd sysusersdir, but it is desirable to be able to choose a different location in some cases. For example, Fedora flatpak builds change the RPM %_sysusersdir macro, but we can't currently honour that. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Reported-by: Yaakov Selkowitz <yselkowi@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
6759137f72
commit
f2828880b6
@ -1326,6 +1326,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
||||
-Drunstatedir=%{_rundir} \
|
||||
-Dinitconfdir=%{_sysconfdir}/sysconfig \
|
||||
-Dunitdir=%{_unitdir} \
|
||||
-Dsysusersdir=%{_sysusersdir} \
|
||||
%{?arg_qemu} \
|
||||
%{?arg_openvz} \
|
||||
%{?arg_lxc} \
|
||||
|
@ -100,6 +100,11 @@ if unitdir == ''
|
||||
unitdir = prefix / 'lib' / 'systemd' / 'system'
|
||||
endif
|
||||
|
||||
sysusersdir = getoption('sysusersdir')
|
||||
if sysusersdir == ''
|
||||
sysusersdir = prefix / 'lib' / 'sysusers.d'
|
||||
endif
|
||||
|
||||
bindir = prefix / get_option('bindir')
|
||||
datadir = prefix / get_option('datadir')
|
||||
includedir = prefix / get_option('includedir')
|
||||
|
@ -5,6 +5,7 @@ option('system', type: 'boolean', value: false, description: 'Set install paths
|
||||
option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc')
|
||||
option('initconfdir', type: 'string', value: '', description: 'directory for init script configuration files')
|
||||
option('unitdir', type: 'string', value: '', description: 'directory for systemd unit files')
|
||||
option('sysusersdir', type: 'string', value: '', description: 'directory for sysusers files')
|
||||
# dep:tests
|
||||
option('expensive_tests', type: 'feature', value: 'auto', description: 'set the default for enabling expensive tests (long timeouts)')
|
||||
option('test_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation')
|
||||
|
@ -163,7 +163,7 @@ if conf.has('WITH_QEMU')
|
||||
# Install the sysuser config for the qemu driver
|
||||
install_data(
|
||||
'libvirt-qemu.sysusers.conf',
|
||||
install_dir: prefix / 'lib' / 'sysusers.d',
|
||||
install_dir: sysusersdir,
|
||||
rename: [ 'libvirt-qemu.conf' ],
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user