Merge pull request #15310 from poettering/repart-no-enable

make systemd-repart static again, but condition it out if no config

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
 

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',                        ''],
 ]

units/systemd-repart.service.in

@@ -15,6 +15,10 @@ Conflicts=shutdown.target
 After=sysroot.mount
 Before=initrd-root-fs.target shutdown.target
 ConditionVirtualization=!container
+ConditionDirectoryNotEmpty=|/usr/lib/repart.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/repart.d
+ConditionDirectoryNotEmpty=|/etc/repart.d
+ConditionDirectoryNotEmpty=|/run/repart.d
 
 [Service]
 Type=oneshot
@@ -23,7 +27,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