From 7e1ed1f3b29162df25064b33dc55ac8cf432bb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 13 Mar 2020 18:33:44 +0100 Subject: [PATCH] units: make systemd-repart.service installable This essentially adds another layer of configurability: build disable, this, presence of configuration. The default is set to enabled, because the service does nothing w/o config. --- presets/90-systemd.preset | 1 + units/meson.build | 3 +-- units/systemd-repart.service.in | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset index dc9d02f0b9..7406c92a5c 100644 --- a/presets/90-systemd.preset +++ b/presets/90-systemd.preset @@ -19,6 +19,7 @@ enable getty@.service enable systemd-timesyncd.service enable systemd-networkd.service enable systemd-resolved.service +enable systemd-repart.service disable console-getty.service disable debug-shell.service diff --git a/units/meson.build b/units/meson.build index ea91f0cc9e..9964eb79a4 100644 --- a/units/meson.build +++ b/units/meson.build @@ -228,8 +228,7 @@ in_units = [ 'multi-user.target.wants/'], ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], ['systemd-volatile-root.service', ''], - ['systemd-repart.service', 'ENABLE_REPART', - 'sysinit.target.wants/ initrd-root-fs.target.wants/'], + ['systemd-repart.service', 'ENABLE_REPART'], ['user-runtime-dir@.service', ''], ['user@.service', ''], ] diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in index 7ce6aefd29..41a9d82b93 100644 --- a/units/systemd-repart.service.in +++ b/units/systemd-repart.service.in @@ -21,5 +21,9 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootbindir@/systemd-repart --dry-run=no -# The tool returns 77 if there's no GPT partition table pre-existing +# The tool returns 77 if there's no existing GPT partition table SuccessExitStatus=77 + +[Install] +WantedBy=sysinit.target +WantedBy=initrd-root-fs.target