summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-05-21 23:09:18 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-05-21 17:09:18 -0400
commit0525107594f16f55efead867560ecd14d96d1f2f (patch)
tree414c0aceaeb16b59ca13bc03e552b90ec7d181f7
parentcf447cb62d01137f4cbd1cd14b83b88823542bbf (diff)
downloadsystemd-0525107594f16f55efead867560ecd14d96d1f2f.tar.gz
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.
-rw-r--r--units/ldconfig.service1
1 files changed, 1 insertions, 0 deletions
diff --git a/units/ldconfig.service b/units/ldconfig.service
index 0910fff054..d7b78bacf9 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]