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.

diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index db61ef12d356f6edf67d5bf5334a922af7959851..6beedf79e7fd88a634ce1370111b2ccacc42c3a7 100644 (file)
--- 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 8ec9eb94e4b19be72dd957a0453bafc8d6e338cd..ba3abc29ea535017ce49f8cb4437c0db984fb6d0 100644 (file)
--- 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 41a9d82b93a0692ddd4e6a76ce2229579aa4af0d..914d0f7c14ec854ad11e0c35dad56b0973997bc6 100644 (file)
--- 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