shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

meson: fix condition for installation of .in units, 99-default.link

Browse Source 
The condition to install in_units was calculated, but not used.

99-default.link should be installed uncoditionally.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-13 20:17:04 -04:00
parent b184e8feb9
commit 9ac47f3815
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
network/meson.build
View File

@ -4,9 +4,11 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
install_data('80-container-host0.network', install_data('80-container-host0.network',
'80-container-ve.network', '80-container-ve.network',
'80-container-vz.network', '80-container-vz.network',
'99-default.link',
install_dir : networkdir) install_dir : networkdir)
meson.add_install_script('sh', '-c', meson.add_install_script('sh', '-c',
mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) mkdir_p.format(join_paths(sysconfdir, 'systemd/network')))
endif endif
install_data('99-default.link',
install_dir : networkdir)

2
units/meson.build
View File

@ -255,7 +255,7 @@ foreach tuple : in_units
output : file, output : file,
command : [sed, '/^## /d', '@INPUT@'], command : [sed, '/^## /d', '@INPUT@'],
capture : true, capture : true,
install : true, install : install,
install_dir : systemunitdir) install_dir : systemunitdir)
if install and tuple.length() > 2 if install and tuple.length() > 2