diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-04-17 19:49:10 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-04-17 19:49:10 +0200 |
| commit | edac2c4716cc9b58c1bfc3cdd7dbd8a4b5b1ce77 (patch) | |
| tree | 46fa690b1e077a3daab00bedd059f165171b6f00 | |
| parent | Merge pull request #8716 from keszybz/two-nitpicks (diff) | |
| download | systemd-edac2c4716cc9b58c1bfc3cdd7dbd8a4b5b1ce77.tar.xz systemd-edac2c4716cc9b58c1bfc3cdd7dbd8a4b5b1ce77.zip | |
unit,meson: drop .in suffix if no substitution is required (#8740)
| -rw-r--r-- | units/console-getty.service.m4 (renamed from units/console-getty.service.m4.in) | 0 | ||||
| -rw-r--r-- | units/container-getty@.service.m4 (renamed from units/container-getty@.service.m4.in) | 0 | ||||
| -rw-r--r-- | units/meson.build | 20 | ||||
| -rw-r--r-- | units/system-update-cleanup.service (renamed from units/system-update-cleanup.service.in) | 0 |
4 files changed, 3 insertions, 17 deletions
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4 index 3c553240a2..3c553240a2 100644 --- a/units/console-getty.service.m4.in +++ b/units/console-getty.service.m4 diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4 index 087ab7f9b1..087ab7f9b1 100644 --- a/units/container-getty@.service.m4.in +++ b/units/container-getty@.service.m4 diff --git a/units/meson.build b/units/meson.build index dac8feb27c..5e454ab3b1 100644 --- a/units/meson.build +++ b/units/meson.build @@ -79,6 +79,7 @@ units = [ ['sysinit.target', ''], ['syslog.socket', ''], ['system-update.target', ''], + ['system-update-cleanup.service', ''], ['systemd-ask-password-console.path', '', 'sysinit.target.wants/'], ['systemd-ask-password-wall.path', '', @@ -127,7 +128,6 @@ in_units = [ ['quotaon.service', 'ENABLE_QUOTACHECK'], ['rc-local.service', 'HAVE_SYSV_COMPAT'], ['rescue.service', ''], - ['system-update-cleanup.service', ''], ['systemd-ask-password-console.service', ''], ['systemd-ask-password-wall.service', ''], ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], @@ -222,28 +222,14 @@ in_units = [ ] m4_units = [ + ['console-getty.service', ''], + ['container-getty@.service', ''], ['getty@.service', '', 'autovt@.service ' + join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], ['serial-getty@.service', ''], ] -m4_in_units = [ - ['console-getty.service', ''], - ['container-getty@.service', ''], -] - -foreach tuple : m4_in_units - file = tuple[0] - - gen = configure_file( - input : file + '.m4.in', - output : file + '.m4', - configuration : substs) - - m4_units += [[file, tuple.get(1, ''), tuple.get(2, ''), gen]] -endforeach - foreach tuple : in_units file = tuple[0] diff --git a/units/system-update-cleanup.service.in b/units/system-update-cleanup.service index 58baab3023..58baab3023 100644 --- a/units/system-update-cleanup.service.in +++ b/units/system-update-cleanup.service |