From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Apr 2021 09:22:21 +0000 (+0200)
Subject: units: fix repart conditions to run if definitions exist in /sysroot + /sysusr
X-Git-Tag: v249-rc1~376
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2671fbefcec9f31817ea75aab32531305952876f;p=thirdparty%2Fsystemd.git

units: fix repart conditions to run if definitions exist in /sysroot + /sysusr

The systemd-repart code was already smart enough to look for definitions
there, but the unit file conditions made that pointless. Let's fix that.
---

diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 60dc7783b3b..4634d983c18 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -19,6 +19,11 @@ ConditionDirectoryNotEmpty=|/usr/lib/repart.d
 ConditionDirectoryNotEmpty=|/usr/local/lib/repart.d
 ConditionDirectoryNotEmpty=|/etc/repart.d
 ConditionDirectoryNotEmpty=|/run/repart.d
+ConditionDirectoryNotEmpty=|/sysroot/usr/lib/repart.d
+ConditionDirectoryNotEmpty=|/sysroot/usr/local/lib/repart.d
+ConditionDirectoryNotEmpty=|/sysroot/etc/repart.d
+ConditionDirectoryNotEmpty=|/sysusr/usr/lib/repart.d
+ConditionDirectoryNotEmpty=|/sysusr/usr/local/lib/repart.d
 
 [Service]
 Type=oneshot