diff --git a/units/meson.build b/units/meson.build index 3820585051..a53632cd9d 100644 --- a/units/meson.build +++ b/units/meson.build @@ -22,7 +22,7 @@ units = [ ['halt.target', ''], ['hibernate.target', 'ENABLE_HIBERNATE'], ['hybrid-sleep.target', 'ENABLE_HIBERNATE'], - ['suspend-then-hibernate.target', 'ENABLE_HIBERNATE'], + ['suspend-then-hibernate.target', 'ENABLE_HIBERNATE'], ['initrd-fs.target', ''], ['initrd-root-device.target', ''], ['initrd-root-fs.target', ''], @@ -34,8 +34,7 @@ units = [ ['local-fs-pre.target', ''], ['local-fs.target', ''], ['machine.slice', 'ENABLE_MACHINED'], - ['machines.target', 'ENABLE_MACHINED', - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['machines.target', 'ENABLE_MACHINED'], ['multi-user.target', '', 'runlevel2.target runlevel3.target runlevel4.target'], ['network-online.target', ''], @@ -52,11 +51,9 @@ units = [ ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'runlevel6.target ctrl-alt-del.target'], - ['remote-cryptsetup.target', 'HAVE_LIBCRYPTSETUP', - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['remote-cryptsetup.target', 'HAVE_LIBCRYPTSETUP'], ['remote-fs-pre.target', ''], - ['remote-fs.target', '', - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['remote-fs.target', ''], ['rescue.target', '', 'runlevel1.target'], ['rpcbind.target', ''], @@ -97,8 +94,7 @@ units = [ 'sockets.target.wants/'], ['systemd-journald.socket', '', 'sockets.target.wants/'], - ['systemd-networkd.socket', 'ENABLE_NETWORKD', - join_paths(pkgsysconfdir, 'system/sockets.target.wants/')], + ['systemd-networkd.socket', 'ENABLE_NETWORKD'], ['systemd-poweroff.service', ''], ['systemd-reboot.service', ''], ['systemd-rfkill.socket', 'ENABLE_RFKILL'], @@ -175,11 +171,8 @@ in_units = [ 'dbus-org.freedesktop.machine1.service'], ['systemd-modules-load.service', 'HAVE_KMOD', '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', - join_paths(pkgsysconfdir, 'system/network-online.target.wants/')], + ['systemd-networkd.service', 'ENABLE_NETWORKD'], + ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD'], ['systemd-nspawn@.service', ''], ['systemd-portabled.service', 'ENABLE_PORTABLED', 'dbus-org.freedesktop.portable1.service'], @@ -187,9 +180,7 @@ in_units = [ ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', 'sysinit.target.wants/'], ['systemd-remount-fs.service', ''], - ['systemd-resolved.service', 'ENABLE_RESOLVE', - join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' + - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['systemd-resolved.service', 'ENABLE_RESOLVE'], ['systemd-rfkill.service', 'ENABLE_RFKILL'], ['systemd-suspend.service', ''], ['systemd-sysctl.service', '', @@ -198,8 +189,7 @@ in_units = [ 'sysinit.target.wants/'], ['systemd-timedated.service', 'ENABLE_TIMEDATED', 'dbus-org.freedesktop.timedate1.service'], - ['systemd-timesyncd.service', 'ENABLE_TIMESYNCD', - join_paths(pkgsysconfdir, 'system/sysinit.target.wants/')], + ['systemd-timesyncd.service', 'ENABLE_TIMESYNCD'], ['systemd-time-wait-sync.service', 'ENABLE_TIMESYNCD'], ['systemd-tmpfiles-clean.service', 'ENABLE_TMPFILES'], ['systemd-tmpfiles-setup-dev.service', 'ENABLE_TMPFILES', @@ -229,8 +219,7 @@ m4_units = [ ['console-getty.service', ''], ['container-getty@.service', ''], ['getty@.service', '', - 'autovt@.service ' + - join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], + 'autovt@.service '], ['serial-getty@.service', ''], ]