Skip to content
This repository was archived by the owner on Jul 18, 2019. It is now read-only.

Commit 4429c69

Browse files
yuwatakeszybz
authored andcommitted
units: do not perform m4 if not necessary (systemd#6575)
1 parent c7f6ca9 commit 4429c69

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

units/meson.build

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ units = [
9999
'sockets.target.wants/'],
100100
['time-sync.target', ''],
101101
['timers.target', ''],
102+
['tmp.mount', '',
103+
'local-fs.target.wants/'],
102104
['umount.target', ''],
103105
['user.slice', ''],
104106
['var-lib-machines.mount', 'ENABLE_MACHINED',
@@ -161,6 +163,9 @@ in_units = [
161163
'dbus-org.freedesktop.machine1.service'],
162164
['systemd-modules-load.service', 'HAVE_KMOD',
163165
'sysinit.target.wants/'],
166+
['systemd-networkd.service', 'ENABLE_NETWORKD',
167+
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
168+
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
164169
['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD',
165170
join_paths(pkgsysconfdir, 'system/network-online.target.wants/')],
166171
@@ -171,6 +176,9 @@ in_units = [
171176
['systemd-reboot.service', ''],
172177
['systemd-remount-fs.service', '',
173178
'local-fs.target.wants/'],
179+
['systemd-resolved.service', 'ENABLE_RESOLVED',
180+
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
181+
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
174182
['systemd-rfkill.service', 'ENABLE_RFKILL'],
175183
['systemd-suspend.service', ''],
176184
['systemd-sysctl.service', '',
@@ -201,27 +209,19 @@ in_units = [
201209
'multi-user.target.wants/'],
202210
['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'],
203211
['systemd-volatile-root.service', ''],
212+
204213
]
205214

206215
m4_units = [
207216
208217
209218
join_paths(pkgsysconfdir, 'system/getty.target.wants/[email protected]')],
210219
211-
['tmp.mount', '',
212-
'local-fs.target.wants/'],
213220
]
214221

215222
m4_in_units = [
216223
['console-getty.service', ''],
217224
218-
['systemd-networkd.service', 'ENABLE_NETWORKD',
219-
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
220-
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
221-
['systemd-resolved.service', 'ENABLE_RESOLVED',
222-
join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
223-
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
224-
225225
]
226226

227227
foreach tuple : m4_in_units
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)