picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

units: do not perform m4 if not necessary (#6575)

This commit is contained in:
Yu Watanabe 2017-08-09 22:13:41 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent c7f6ca9379
commit 4429c69f8d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
units/meson.build
View File

@ -99,6 +99,8 @@ units = [
'sockets.target.wants/'], 'sockets.target.wants/'],
['time-sync.target', ''], ['time-sync.target', ''],
['timers.target', ''], ['timers.target', ''],
['tmp.mount', '',
'local-fs.target.wants/'],
['umount.target', ''], ['umount.target', ''],
['user.slice', ''], ['user.slice', ''],
['var-lib-machines.mount', 'ENABLE_MACHINED', ['var-lib-machines.mount', 'ENABLE_MACHINED',
@ -161,6 +163,9 @@ in_units = [
'dbus-org.freedesktop.machine1.service'], 'dbus-org.freedesktop.machine1.service'],
['systemd-modules-load.service', 'HAVE_KMOD', ['systemd-modules-load.service', 'HAVE_KMOD',
'sysinit.target.wants/'], 'sysinit.target.wants/'],
['systemd-networkd.service', 'ENABLE_NETWORKD',
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD', ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD',
join_paths(pkgsysconfdir, 'system/network-online.target.wants/')], join_paths(pkgsysconfdir, 'system/network-online.target.wants/')],
['systemd-nspawn@.service', ''], ['systemd-nspawn@.service', ''],
@ -171,6 +176,9 @@ in_units = [
['systemd-reboot.service', ''], ['systemd-reboot.service', ''],
['systemd-remount-fs.service', '', ['systemd-remount-fs.service', '',
'local-fs.target.wants/'], 'local-fs.target.wants/'],
['systemd-resolved.service', 'ENABLE_RESOLVED',
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
['systemd-rfkill.service', 'ENABLE_RFKILL'], ['systemd-rfkill.service', 'ENABLE_RFKILL'],
['systemd-suspend.service', ''], ['systemd-suspend.service', ''],
['systemd-sysctl.service', '', ['systemd-sysctl.service', '',
@ -201,6 +209,7 @@ in_units = [
'multi-user.target.wants/'], 'multi-user.target.wants/'],
['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'],
['systemd-volatile-root.service', ''], ['systemd-volatile-root.service', ''],
['user@.service', ''],
] ]
m4_units = [ m4_units = [
@ -208,20 +217,11 @@ m4_units = [
'autovt@.service ' + 'autovt@.service ' +
join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')],
['serial-getty@.service', ''], ['serial-getty@.service', ''],
['tmp.mount', '',
'local-fs.target.wants/'],
] ]
m4_in_units = [ m4_in_units = [
['console-getty.service', ''], ['console-getty.service', ''],
['container-getty@.service', ''], ['container-getty@.service', ''],
['systemd-networkd.service', 'ENABLE_NETWORKD',
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
['systemd-resolved.service', 'ENABLE_RESOLVED',
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
['user@.service', ''],
] ]
foreach tuple : m4_in_units foreach tuple : m4_in_units

0
units/systemd-networkd.service.m4.in → units/systemd-networkd.service.in
View File

0
units/systemd-resolved.service.m4.in → units/systemd-resolved.service.in
View File

0
units/tmp.mount.m4 → units/tmp.mount
View File

0
units/user@.service.m4.in → units/user@.service.in
View File