From aade0c3b6e6f7a6d860cbcaf48a1d6dc02f4f460 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 2 Apr 2020 17:01:34 +0200
Subject: [PATCH] Revert "units: make systemd-repart.service installable"

This reverts commit 7e1ed1f3b29162df25064b33dc55ac8cf432bb0b.

systemd-repart is not a user service that should be something people
enable/disable, instead it should just work if there's configuration for
it. It's like systemd-tmpfiles, systemd-sysusers, systemd-load-modules,
systemd-binfmt, systemd-systemd-sysctl which are NOPs if they have no
configuration, and thus don't hurt, but cannot be disabled since they
are too deep part of the OS.

This doesn't mean people couldn't disable the service if they really
want to, there's after all "systemctl mask" and build-time disabling,
but those are OS developer facing instead of admin facing, that's how it
should be.

Note that systemd-repart is in particular an initrd service, and so far
enable/disable state of those is not managed anyway via "systemctl
enable/disable" but more what dracut decides to package up and what not.
---
 presets/90-systemd.preset       | 1 -
 units/meson.build               | 3 ++-
 units/systemd-repart.service.in | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index db61ef12d3..6beedf79e7 100644
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -19,7 +19,6 @@ enable getty@.service
 enable systemd-timesyncd.service
 enable systemd-networkd.service
 enable systemd-resolved.service
-enable systemd-repart.service
 enable systemd-homed.service
 enable systemd-userdbd.socket
 
diff --git a/units/meson.build b/units/meson.build
index 8ec9eb94e4..ba3abc29ea 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -226,7 +226,8 @@ in_units = [
          'multi-user.target.wants/'],
         ['systemd-vconsole-setup.service',       'ENABLE_VCONSOLE'],
         ['systemd-volatile-root.service',        ''],
-        ['systemd-repart.service',               'ENABLE_REPART'],
+        ['systemd-repart.service',               'ENABLE_REPART',
+         'sysinit.target.wants/ initrd-root-fs.target.wants/'],
         ['user-runtime-dir@.service',            ''],
         ['user@.service',                        ''],
 ]
diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 41a9d82b93..914d0f7c14 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -23,7 +23,3 @@ ExecStart=@rootbindir@/systemd-repart --dry-run=no
 
 # The tool returns 77 if there's no existing GPT partition table
 SuccessExitStatus=77
-
-[Install]
-WantedBy=sysinit.target
-WantedBy=initrd-root-fs.target