From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 21 May 2016 21:09:18 +0000 (+0200)
Subject: units: restore ConditionNeesUpdate=/etc in ldconfig.service (#3311)
X-Git-Tag: v230~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0525107594f16f55efead867560ecd14d96d1f2f;p=thirdparty%2Fsystemd.git

units: restore ConditionNeesUpdate=/etc in ldconfig.service (#3311)

In order to support stateless systems that support offline /usr updates
properly, let's restore the ConditionNeesUpdate=/etc line that makes sure we
are run when /usr is updated and this update needs to be propagated to the
/etc/ld.so.conf file stored in /etc.

This reverts part of #2859, which snuck this change in, but really shouldn't
have.
---

diff --git a/units/ldconfig.service b/units/ldconfig.service
index 0910fff054f..d7b78bacf9b 100644
--- a/units/ldconfig.service
+++ b/units/ldconfig.service
@@ -12,6 +12,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 After=local-fs.target
 Before=sysinit.target shutdown.target systemd-update-done.service
+ConditionNeedsUpdate=|/etc
 ConditionFileNotEmpty=|!/etc/ld.so.cache
 
 [Service]